Skip to content

Commit ceda6b3

Browse files
committed
Simplify cookies tests
They don't vary across browsers, so stop distinguishing. I think we are accidentally skipping checks for edge as well. And delete phantom specific handling, we don't support phantom anymore.
1 parent 3191663 commit ceda6b3

File tree

1 file changed

+25
-98
lines changed

1 file changed

+25
-98
lines changed

test/etaoin/api_test.clj

+25-98
Original file line numberDiff line numberDiff line change
@@ -543,105 +543,32 @@
543543

544544
(deftest test-cookies
545545
(testing "getting all cookies"
546-
(let [cookies (e/get-cookies *driver*)]
547-
(e/when-safari *driver*
548-
;; Safari Webdriver v16.4 added sameSite, we'll ignore it for now
549-
(let [cookies (map #(dissoc % :sameSite) cookies)]
550-
(is (= cookies
551-
[{:domain ".^filecookies^"
552-
:secure false
553-
:httpOnly false
554-
:value "test1"
555-
:path "/"
556-
:name "cookie1"}
557-
{:domain ".^filecookies^"
558-
:secure false
559-
:httpOnly false
560-
:value "test2"
561-
:path "/"
562-
:name "cookie2"}]))))
563-
(e/when-chrome *driver*
564-
(is (= cookies [{:domain "localhost"
565-
:httpOnly false
566-
:name "cookie2"
567-
:path "/"
568-
:sameSite "Lax"
569-
:secure false
570-
:value "test2"}
571-
{:domain "localhost"
572-
:httpOnly false
573-
:name "cookie1"
574-
:path "/"
575-
:sameSite "Lax"
576-
:secure false
577-
:value "test1"}])))
578-
(e/when-firefox *driver*
579-
;; Firefox Webdriver added sameSite, we'll ignore it for now
580-
(let [cookies (map #(dissoc % :sameSite) cookies)]
581-
(is (= cookies [{:name "cookie1",
582-
:value "test1",
583-
:path "/",
584-
:domain "localhost",
585-
:secure false,
586-
:httpOnly false}
587-
{:name "cookie2",
588-
:value "test2",
589-
:path "/",
590-
:domain "localhost",
591-
:secure false,
592-
:httpOnly false}]))))
593-
(e/when-phantom *driver*
594-
(is (= cookies [{:domain "localhost",
595-
:httponly false,
596-
:name "cookie2",
597-
:path "/",
598-
:secure false,
599-
:value "test2"}
600-
{:domain "localhost",
601-
:httponly false,
602-
:name "cookie1",
603-
:path "/",
604-
:secure false,
605-
:value "test1"}])))))
546+
(let [cookies (e/get-cookies *driver*)
547+
sorted-cookies (->> cookies
548+
(map #(dissoc % :sameSite)) ;; varies, maybe we don't care about this one
549+
(sort-by :name) ;; order varies we don't care
550+
)]
551+
(is (= sorted-cookies [{:domain "localhost"
552+
:httpOnly false
553+
:name "cookie1"
554+
:path "/"
555+
:secure false
556+
:value "test1"}
557+
{:domain "localhost"
558+
:httpOnly false
559+
:name "cookie2"
560+
:path "/"
561+
:secure false
562+
:value "test2"}]))))
606563
(testing "getting a cookie"
607-
(let [cookie (e/get-cookie *driver* :cookie2)]
608-
(e/when-safari *driver*
609-
;; Safari Webdriver v16.4 added sameSite, we'll ignore it for now
610-
(let [cookie (dissoc cookie :sameSite)]
611-
(is (= cookie
612-
{:domain ".^filecookies^"
613-
:secure false
614-
:httpOnly false
615-
:value "test2"
616-
:path "/"
617-
:name "cookie2"}))))
618-
(e/when-chrome *driver*
619-
(is (= cookie
620-
{:domain "localhost"
621-
:httpOnly false
622-
:name "cookie2"
623-
:path "/"
624-
:sameSite "Lax"
625-
:secure false
626-
:value "test2"})))
627-
(e/when-firefox *driver*
628-
;; Firefox Webdriver added sameSite, we'll ignore it for now
629-
(let [cookie (dissoc cookie :sameSite)]
630-
(is (= cookie
631-
{:name "cookie2"
632-
:value "test2"
633-
:path "/"
634-
:domain "localhost"
635-
:secure false
636-
:httpOnly false}))))
637-
(e/when-phantom *driver*
638-
(is (= cookie
639-
{:domain ""
640-
:httponly false
641-
:name "cookie2"
642-
:path "/"
643-
:secure false
644-
:value "test2"})))))
564+
(let [cookie (e/get-cookie *driver* :cookie2)
565+
cookie (dissoc cookie :sameSite)]
566+
(is (= cookie {:domain "localhost"
567+
:httpOnly false
568+
:name "cookie2"
569+
:path "/"
570+
:secure false
571+
:value "test2"}))))
645572
(testing "deleting a cookie"
646573
(e/when-not-phantom
647574
*driver*

0 commit comments

Comments
 (0)