Bug 1456799 - [wdspec] Use wdclient to get a named cookie in add cookie tests. draft
authorHenrik Skupin <mail@hskupin.info>
Wed, 25 Apr 2018 17:59:09 +0200
changeset 787906 81af0415a54bb998ef4d8326cb2c3a1a4982a707
parent 787905 35d3b4646f5ce939480349740424d43723a0894d
push id107833
push userbmo:hskupin@gmail.com
push dateWed, 25 Apr 2018 16:12:41 +0000
bugs1456799
milestone61.0a1
Bug 1456799 - [wdspec] Use wdclient to get a named cookie in add cookie tests. MozReview-Commit-ID: 7PP4mPyxk6N
testing/web-platform/tests/webdriver/tests/cookies/add_cookie.py
--- a/testing/web-platform/tests/webdriver/tests/cookies/add_cookie.py
+++ b/testing/web-platform/tests/webdriver/tests/cookies/add_cookie.py
@@ -1,11 +1,12 @@
+from datetime import datetime, timedelta
+
 from tests.support.asserts import assert_success
 from tests.support.fixtures import clear_all_cookies
-from datetime import datetime, timedelta
 
 
 def add_cookie(session, cookie):
     return session.transport.send(
         "POST", "session/{session_id}/cookie".format(**vars(session)),
         {"cookie": cookie})
 
 
@@ -20,30 +21,23 @@ def test_add_domain_cookie(session, url,
     }
 
     session.url = url("/common/blank.html")
     clear_all_cookies(session)
 
     result = add_cookie(session, new_cookie)
     assert_success(result)
 
-    result = session.transport.send("GET", "session/%s/cookie" % session.session_id)
-    assert result.status == 200
-    assert "value" in result.body
-    assert isinstance(result.body["value"], list)
-    assert len(result.body["value"]) == 1
-    assert isinstance(result.body["value"][0], dict)
-
-    cookie = result.body["value"][0]
+    cookie = session.cookies("hello")
+    assert "domain" in cookie
+    assert isinstance(cookie["domain"], basestring)
     assert "name" in cookie
     assert isinstance(cookie["name"], basestring)
     assert "value" in cookie
     assert isinstance(cookie["value"], basestring)
-    assert "domain" in cookie
-    assert isinstance(cookie["domain"], basestring)
 
     assert cookie["name"] == "hello"
     assert cookie["value"] == "world"
     assert cookie["domain"] == server_config["browser_host"] or \
         cookie["domain"] == ".%s" % server_config["browser_host"]
 
 
 def test_add_cookie_for_ip(session, url, server_config, configuration):
@@ -57,24 +51,17 @@ def test_add_cookie_for_ip(session, url,
     }
 
     session.url = "http://127.0.0.1:%s/common/blank.html" % (server_config["ports"]["http"][0])
     clear_all_cookies(session)
 
     result = add_cookie(session, new_cookie)
     assert_success(result)
 
-    result = session.transport.send("GET", "session/%s/cookie" % session.session_id)
-    assert result.status == 200
-    assert "value" in result.body
-    assert isinstance(result.body["value"], list)
-    assert len(result.body["value"]) == 1
-    assert isinstance(result.body["value"][0], dict)
-
-    cookie = result.body["value"][0]
+    cookie = session.cookies("hello")
     assert "name" in cookie
     assert isinstance(cookie["name"], basestring)
     assert "value" in cookie
     assert isinstance(cookie["value"], basestring)
     assert "domain" in cookie
     assert isinstance(cookie["domain"], basestring)
 
     assert cookie["name"] == "hello"
@@ -93,24 +80,17 @@ def test_add_non_session_cookie(session,
     }
 
     session.url = url("/common/blank.html")
     clear_all_cookies(session)
 
     result = add_cookie(session, new_cookie)
     assert_success(result)
 
-    result = session.transport.send("GET", "session/%s/cookie" % session.session_id)
-    assert result.status == 200
-    assert "value" in result.body
-    assert isinstance(result.body["value"], list)
-    assert len(result.body["value"]) == 1
-    assert isinstance(result.body["value"][0], dict)
-
-    cookie = result.body["value"][0]
+    cookie = session.cookies("hello")
     assert "name" in cookie
     assert isinstance(cookie["name"], basestring)
     assert "value" in cookie
     assert isinstance(cookie["value"], basestring)
     assert "expiry" in cookie
     assert isinstance(cookie["expiry"], int)
 
     assert cookie["name"] == "hello"
@@ -125,24 +105,17 @@ def test_add_session_cookie(session, url
     }
 
     session.url = url("/common/blank.html")
     clear_all_cookies(session)
 
     result = add_cookie(session, new_cookie)
     assert_success(result)
 
-    result = session.transport.send("GET", "session/%s/cookie" % session.session_id)
-    assert result.status == 200
-    assert "value" in result.body
-    assert isinstance(result.body["value"], list)
-    assert len(result.body["value"]) == 1
-    assert isinstance(result.body["value"][0], dict)
-
-    cookie = result.body["value"][0]
+    cookie = session.cookies("hello")
     assert "name" in cookie
     assert isinstance(cookie["name"], basestring)
     assert "value" in cookie
     assert isinstance(cookie["value"], basestring)
     if "expiry" in cookie:
         assert cookie.get("expiry") is None
 
     assert cookie["name"] == "hello"
@@ -157,24 +130,17 @@ def test_add_session_cookie_with_leading
     }
 
     session.url = url("/common/blank.html")
     clear_all_cookies(session)
 
     result = add_cookie(session, new_cookie)
     assert_success(result)
 
-    result = session.transport.send("GET", "session/%s/cookie" % session.session_id)
-    assert result.status == 200
-    assert "value" in result.body
-    assert isinstance(result.body["value"], list)
-    assert len(result.body["value"]) == 1
-    assert isinstance(result.body["value"][0], dict)
-
-    cookie = result.body["value"][0]
+    cookie = session.cookies("hello")
     assert "name" in cookie
     assert isinstance(cookie["name"], basestring)
     assert "value" in cookie
     assert isinstance(cookie["value"], basestring)
     assert "domain" in cookie
     assert isinstance(cookie["domain"], basestring)
 
     assert cookie["name"] == "hello"