Skip to content

Commit b4dcbd9

Browse files
mxschmittmxschmitt
committed
make build green
1 parent 69d18bf commit b4dcbd9

File tree

6 files changed

+58
-26
lines changed

6 files changed

+58
-26
lines changed

‎playwright/_impl/_network.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,11 @@ def post_data_json(self) -> Optional[Any]:
176176

177177
@property
178178
def post_data_buffer(self) -> Optional[bytes]:
179-
return self._fallback_overrides.post_data_buffer
179+
if self._fallback_overrides.post_data_buffer:
180+
return self._fallback_overrides.post_data_buffer
181+
if self._initializer.get("postData"):
182+
return base64.b64decode(self._initializer["postData"])
183+
return None
180184

181185
async def response(self) -> Optional["Response"]:
182186
return from_nullable_channel(await self._channel.send("response"))

‎tests/async/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,14 @@ async def launch(**kwargs: Any) -> BrowserContext:
101101

102102

103103
@pytest.fixture(scope="session")
104-
async def default_same_site_cookie_value(browser_name: str) -> str:
104+
async def default_same_site_cookie_value(browser_name: str, is_linux: bool) -> str:
105105
if browser_name == "chromium":
106106
return "Lax"
107107
if browser_name == "firefox":
108108
return "None"
109-
if browser_name == "webkit":
109+
if browser_name == "webkit" and is_linux:
110+
return "Lax"
111+
if browser_name == "webkit" and not is_linux:
110112
return "None"
111113
raise Exception(f"Invalid browser_name: {browser_name}")
112114

‎tests/async/test_browsercontext_add_cookies.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,9 @@ async def test_should_have_expires_set_to_neg_1_for_session_cookies(
233233

234234

235235
async def test_should_set_cookie_with_reasonable_defaults(
236-
context: BrowserContext, server: Server, is_chromium: bool
236+
context: BrowserContext,
237+
server: Server,
238+
default_same_site_cookie_value: str,
237239
) -> None:
238240
await context.add_cookies(
239241
[{"url": server.EMPTY_PAGE, "name": "defaults", "value": "123456"}]
@@ -249,13 +251,16 @@ async def test_should_set_cookie_with_reasonable_defaults(
249251
"expires": -1,
250252
"httpOnly": False,
251253
"secure": False,
252-
"sameSite": "Lax" if is_chromium else "None",
254+
"sameSite": default_same_site_cookie_value,
253255
}
254256
]
255257

256258

257259
async def test_should_set_a_cookie_with_a_path(
258-
context: BrowserContext, page: Page, server: Server, is_chromium: bool
260+
context: BrowserContext,
261+
page: Page,
262+
server: Server,
263+
default_same_site_cookie_value: str,
259264
) -> None:
260265
await page.goto(server.PREFIX + "/grid.html")
261266
await context.add_cookies(
@@ -277,7 +282,7 @@ async def test_should_set_a_cookie_with_a_path(
277282
"expires": -1,
278283
"httpOnly": False,
279284
"secure": False,
280-
"sameSite": "Lax" if is_chromium else "None",
285+
"sameSite": default_same_site_cookie_value,
281286
}
282287
]
283288
assert await page.evaluate("document.cookie") == "gridcookie=GRID"
@@ -342,7 +347,10 @@ async def test_should_be_able_to_set_unsecure_cookie_for_http_website(
342347

343348

344349
async def test_should_set_a_cookie_on_a_different_domain(
345-
context: BrowserContext, page: Page, server: Server, is_chromium: bool
350+
context: BrowserContext,
351+
page: Page,
352+
server: Server,
353+
default_same_site_cookie_value: str,
346354
) -> None:
347355
await page.goto(server.EMPTY_PAGE)
348356
await context.add_cookies(
@@ -358,7 +366,7 @@ async def test_should_set_a_cookie_on_a_different_domain(
358366
"expires": -1,
359367
"httpOnly": False,
360368
"secure": True,
361-
"sameSite": "Lax" if is_chromium else "None",
369+
"sameSite": default_same_site_cookie_value,
362370
}
363371
]
364372

‎tests/async/test_browsercontext_cookies.py

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ async def test_should_return_no_cookies_in_pristine_browser_context(
2727

2828

2929
async def test_should_get_a_cookie(
30-
context: BrowserContext, page: Page, server: Server, is_chromium: bool
30+
context: BrowserContext,
31+
page: Page,
32+
server: Server,
33+
default_same_site_cookie_value: str,
3134
) -> None:
3235
await page.goto(server.EMPTY_PAGE)
3336
document_cookie = await page.evaluate(
@@ -46,13 +49,16 @@ async def test_should_get_a_cookie(
4649
"expires": -1,
4750
"httpOnly": False,
4851
"secure": False,
49-
"sameSite": "Lax" if is_chromium else "None",
52+
"sameSite": default_same_site_cookie_value,
5053
}
5154
]
5255

5356

5457
async def test_should_get_a_non_session_cookie(
55-
context: BrowserContext, page: Page, server: Server, is_chromium: bool
58+
context: BrowserContext,
59+
page: Page,
60+
server: Server,
61+
default_same_site_cookie_value: str,
5662
) -> None:
5763
await page.goto(server.EMPTY_PAGE)
5864
# @see https://en.wikipedia.org/wiki/Year_2038_problem
@@ -85,7 +91,7 @@ async def test_should_get_a_non_session_cookie(
8591
"path": "/",
8692
"httpOnly": False,
8793
"secure": False,
88-
"sameSite": "Lax" if is_chromium else "None",
94+
"sameSite": default_same_site_cookie_value,
8995
}
9096
]
9197

@@ -146,7 +152,10 @@ async def test_should_properly_report_lax_sameSite_cookie(
146152

147153

148154
async def test_should_get_multiple_cookies(
149-
context: BrowserContext, page: Page, server: Server, is_chromium: bool
155+
context: BrowserContext,
156+
page: Page,
157+
server: Server,
158+
default_same_site_cookie_value: str,
150159
) -> None:
151160
await page.goto(server.EMPTY_PAGE)
152161
document_cookie = await page.evaluate(
@@ -168,7 +177,7 @@ async def test_should_get_multiple_cookies(
168177
"expires": -1,
169178
"httpOnly": False,
170179
"secure": False,
171-
"sameSite": "Lax" if is_chromium else "None",
180+
"sameSite": default_same_site_cookie_value,
172181
},
173182
{
174183
"name": "username",
@@ -178,13 +187,13 @@ async def test_should_get_multiple_cookies(
178187
"expires": -1,
179188
"httpOnly": False,
180189
"secure": False,
181-
"sameSite": "Lax" if is_chromium else "None",
190+
"sameSite": default_same_site_cookie_value,
182191
},
183192
]
184193

185194

186195
async def test_should_get_cookies_from_multiple_urls(
187-
context: BrowserContext, is_chromium: bool
196+
context: BrowserContext, default_same_site_cookie_value: str
188197
) -> None:
189198
await context.add_cookies(
190199
[
@@ -205,7 +214,7 @@ async def test_should_get_cookies_from_multiple_urls(
205214
"expires": -1,
206215
"httpOnly": False,
207216
"secure": True,
208-
"sameSite": "Lax" if is_chromium else "None",
217+
"sameSite": default_same_site_cookie_value,
209218
},
210219
{
211220
"name": "doggo",
@@ -215,6 +224,6 @@ async def test_should_get_cookies_from_multiple_urls(
215224
"expires": -1,
216225
"httpOnly": False,
217226
"secure": True,
218-
"sameSite": "Lax" if is_chromium else "None",
227+
"sameSite": default_same_site_cookie_value,
219228
},
220229
]

‎tests/async/test_defaultbrowsercontext.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
import asyncio
1616
import os
1717
from pathlib import Path
18-
from typing import Any, AsyncGenerator, Awaitable, Callable, Dict, Optional, Tuple
18+
from typing import (
19+
Any,
20+
AsyncGenerator,
21+
Awaitable,
22+
Callable,
23+
Dict,
24+
Literal,
25+
Optional,
26+
Tuple,
27+
)
1928

2029
import pytest
2130

@@ -49,7 +58,7 @@ async def _launch(**options: Any) -> Tuple[Page, BrowserContext]:
4958
async def test_context_cookies_should_work(
5059
server: Server,
5160
launch_persistent: "Callable[..., asyncio.Future[Tuple[Page, BrowserContext]]]",
52-
is_chromium: bool,
61+
default_same_site_cookie_value: str,
5362
) -> None:
5463
(page, context) = await launch_persistent()
5564
await page.goto(server.EMPTY_PAGE)
@@ -70,15 +79,15 @@ async def test_context_cookies_should_work(
7079
"expires": -1,
7180
"httpOnly": False,
7281
"secure": False,
73-
"sameSite": "Lax" if is_chromium else "None",
82+
"sameSite": default_same_site_cookie_value,
7483
}
7584
]
7685

7786

7887
async def test_context_add_cookies_should_work(
7988
server: Server,
8089
launch_persistent: "Callable[..., asyncio.Future[Tuple[Page, BrowserContext]]]",
81-
is_chromium: bool,
90+
default_same_site_cookie_value: Literal["Lax", "None", "Strict"],
8291
) -> None:
8392
(page, context) = await launch_persistent()
8493
await page.goto(server.EMPTY_PAGE)
@@ -88,7 +97,7 @@ async def test_context_add_cookies_should_work(
8897
"url": server.EMPTY_PAGE,
8998
"name": "username",
9099
"value": "John Doe",
91-
"sameSite": "Lax",
100+
"sameSite": default_same_site_cookie_value,
92101
}
93102
]
94103
)
@@ -102,7 +111,7 @@ async def test_context_add_cookies_should_work(
102111
"expires": -1,
103112
"httpOnly": False,
104113
"secure": False,
105-
"sameSite": "Lax" if is_chromium else "None",
114+
"sameSite": default_same_site_cookie_value,
106115
}
107116
]
108117

‎tests/async/test_input.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ async def test_should_upload_a_folder(
429429
await input.set_input_files(dir)
430430
assert set(
431431
await input.evaluate("e => [...e.files].map(f => f.webkitRelativePath)")
432-
) == (
432+
) == set(
433433
[
434434
"file-upload-test/file1.txt",
435435
"file-upload-test/file2",

0 commit comments

Comments
 (0)