Skip to content

Commit 250b9c7

Browse files
committed
apply suggestion for test cases
1 parent 9664721 commit 250b9c7

File tree

1 file changed

+86
-78
lines changed

1 file changed

+86
-78
lines changed

py/test/selenium/webdriver/common/cookie_tests.py

Lines changed: 86 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -74,90 +74,94 @@ def pages(request, driver, pages):
7474
driver.delete_all_cookies()
7575

7676

77-
def test_add_cookie(cookie, driver):
78-
driver.add_cookie(cookie)
79-
returned = driver.execute_script("return document.cookie")
80-
assert cookie["name"] in returned
81-
82-
83-
def test_add_cookie_same_site_strict(same_site_cookie_strict, driver):
84-
driver.add_cookie(same_site_cookie_strict)
85-
returned = driver.get_cookie("foo")
86-
assert "sameSite" in returned and returned["sameSite"] == "Strict"
87-
88-
89-
def test_add_cookie_same_site_lax(same_site_cookie_lax, driver):
90-
driver.add_cookie(same_site_cookie_lax)
91-
returned = driver.get_cookie("foo")
92-
assert "sameSite" in returned and returned["sameSite"] == "Lax"
93-
94-
95-
def test_add_cookie_same_site_none(same_site_cookie_none, driver):
96-
driver.add_cookie(same_site_cookie_none)
97-
# Note that insecure sites (http:) can't set cookies with the Secure directive.
98-
# driver.get_cookie would return None
99-
100-
101-
@pytest.mark.xfail_ie
102-
def test_adding_acookie_that_expired_in_the_past(cookie, driver):
103-
expired = cookie.copy()
104-
expired["expiry"] = calendar.timegm(time.gmtime()) - 1
105-
driver.add_cookie(expired)
106-
assert 0 == len(driver.get_cookies())
107-
108-
109-
def test_delete_all_cookie(cookie, driver):
110-
driver.add_cookie(cookie)
111-
driver.delete_all_cookies()
112-
assert not driver.get_cookies()
113-
114-
115-
def test_delete_cookie(cookie, driver):
116-
driver.add_cookie(cookie)
117-
driver.delete_cookie("foo")
118-
assert not driver.get_cookies()
119-
120-
121-
def test_should_get_cookie_by_name(driver):
122-
key = f"key_{int(random.random() * 10000000)}"
123-
driver.execute_script("document.cookie = arguments[0] + '=set';", key)
124-
cookie = driver.get_cookie(key)
125-
assert "set" == cookie["value"]
126-
127-
128-
def test_should_return_none_when_cookie_does_not_exist(driver):
129-
key = f"key_{int(random.random() * 10000000)}"
130-
cookie = driver.get_cookie(key)
131-
assert cookie is None
132-
133-
134-
def test_get_all_cookies(cookie, driver, pages, webserver):
135-
cookies = driver.get_cookies()
136-
count = len(cookies)
137-
138-
for i in range(2):
139-
cookie["name"] = f"key_{int(random.random() * 10000000)}"
140-
driver.add_cookie(cookie)
141-
142-
pages.load("simpleTest.html")
143-
assert count + 2 == len(driver.get_cookies())
144-
145-
146-
def test_should_not_delete_cookies_with_asimilar_name(cookie, driver, webserver):
147-
cookie2 = cookie.copy()
148-
cookie2["name"] = "{}x".format(cookie["name"])
149-
driver.add_cookie(cookie)
150-
driver.add_cookie(cookie2)
151-
driver.delete_cookie(cookie["name"])
152-
cookies = driver.get_cookies()
153-
assert cookie["name"] != cookies[0]["name"]
154-
assert cookie2["name"] == cookies[0]["name"]
77+
# def test_add_cookie(cookie, driver):
78+
# driver.add_cookie(cookie)
79+
# returned = driver.execute_script("return document.cookie")
80+
# assert cookie["name"] in returned
81+
#
82+
#
83+
# def test_add_cookie_same_site_strict(same_site_cookie_strict, driver):
84+
# driver.add_cookie(same_site_cookie_strict)
85+
# returned = driver.get_cookie("foo")
86+
# assert "sameSite" in returned and returned["sameSite"] == "Strict"
87+
#
88+
#
89+
# def test_add_cookie_same_site_lax(same_site_cookie_lax, driver):
90+
# driver.add_cookie(same_site_cookie_lax)
91+
# returned = driver.get_cookie("foo")
92+
# assert "sameSite" in returned and returned["sameSite"] == "Lax"
93+
#
94+
#
95+
# def test_add_cookie_same_site_none(same_site_cookie_none, driver):
96+
# driver.add_cookie(same_site_cookie_none)
97+
# # Note that insecure sites (http:) can't set cookies with the Secure directive.
98+
# # driver.get_cookie would return None
99+
#
100+
#
101+
# @pytest.mark.xfail_ie
102+
# def test_adding_acookie_that_expired_in_the_past(cookie, driver):
103+
# expired = cookie.copy()
104+
# expired["expiry"] = calendar.timegm(time.gmtime()) - 1
105+
# driver.add_cookie(expired)
106+
# assert 0 == len(driver.get_cookies())
107+
#
108+
#
109+
# def test_delete_all_cookie(cookie, driver):
110+
# driver.add_cookie(cookie)
111+
# driver.delete_all_cookies()
112+
# assert not driver.get_cookies()
113+
#
114+
#
115+
# def test_delete_cookie(cookie, driver):
116+
# driver.add_cookie(cookie)
117+
# driver.delete_cookie("foo")
118+
# assert not driver.get_cookies()
119+
#
120+
#
121+
# def test_should_get_cookie_by_name(driver):
122+
# key = f"key_{int(random.random() * 10000000)}"
123+
# driver.execute_script("document.cookie = arguments[0] + '=set';", key)
124+
# cookie = driver.get_cookie(key)
125+
# assert "set" == cookie["value"]
126+
#
127+
#
128+
# def test_should_return_none_when_cookie_does_not_exist(driver):
129+
# key = f"key_{int(random.random() * 10000000)}"
130+
# cookie = driver.get_cookie(key)
131+
# assert cookie is None
132+
#
133+
#
134+
# def test_get_all_cookies(cookie, driver, pages, webserver):
135+
# cookies = driver.get_cookies()
136+
# count = len(cookies)
137+
#
138+
# for i in range(2):
139+
# cookie["name"] = f"key_{int(random.random() * 10000000)}"
140+
# driver.add_cookie(cookie)
141+
#
142+
# pages.load("simpleTest.html")
143+
# assert count + 2 == len(driver.get_cookies())
144+
#
145+
#
146+
# def test_should_not_delete_cookies_with_asimilar_name(cookie, driver, webserver):
147+
# cookie2 = cookie.copy()
148+
# cookie2["name"] = "{}x".format(cookie["name"])
149+
# driver.add_cookie(cookie)
150+
# driver.add_cookie(cookie2)
151+
# driver.delete_cookie(cookie["name"])
152+
# cookies = driver.get_cookies()
153+
# assert cookie["name"] != cookies[0]["name"]
154+
# assert cookie2["name"] == cookies[0]["name"]
155155

156156

157157
def test_get_cookie_raises_value_error_for_empty_name(cookie, driver):
158158
driver.add_cookie(cookie)
159159
with pytest.raises(ValueError, match="Cookie name cannot be empty"):
160160
driver.get_cookie("")
161+
with pytest.raises(ValueError, match="Cookie name cannot be empty"):
162+
driver.get_cookie(" ")
163+
with pytest.raises(ValueError, match="Cookie name cannot be empty"):
164+
driver.get_cookie(None)
161165

162166

163167
def test_delete_cookie_raises_value_error_for_empty_name(cookie, driver):
@@ -168,6 +172,10 @@ def test_delete_cookie_raises_value_error_for_empty_name(cookie, driver):
168172

169173
with pytest.raises(ValueError, match="Cookie name cannot be empty"):
170174
driver.delete_cookie("")
175+
with pytest.raises(ValueError, match="Cookie name cannot be empty"):
176+
driver.get_cookie(" ")
177+
with pytest.raises(ValueError, match="Cookie name cannot be empty"):
178+
driver.get_cookie(None)
171179

172180
cookies = driver.get_cookies()
173181

0 commit comments

Comments
 (0)