From acc8506e27794e414739caf8c5f693d2d23fa12d Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Tue, 9 Nov 2021 13:45:41 +0100 Subject: [PATCH] test: have server.set_auth accepting strings --- tests/async/test_browsercontext.py | 8 ++++---- tests/async/test_defaultbrowsercontext.py | 2 +- tests/async/test_popup.py | 2 +- tests/server.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/async/test_browsercontext.py b/tests/async/test_browsercontext.py index a3eb36c0e..a21996272 100644 --- a/tests/async/test_browsercontext.py +++ b/tests/async/test_browsercontext.py @@ -535,14 +535,14 @@ async def test_route_should_fall_back_to_context_route(context, server): async def test_auth_should_fail_without_credentials(context, server): - server.set_auth("/empty.html", b"user", b"pass") + server.set_auth("/empty.html", "user", "pass") page = await context.new_page() response = await page.goto(server.EMPTY_PAGE) assert response.status == 401 async def test_auth_should_work_with_correct_credentials(browser, server): - server.set_auth("/empty.html", b"user", b"pass") + server.set_auth("/empty.html", "user", "pass") context = await browser.new_context( http_credentials={"username": "user", "password": "pass"} ) @@ -553,7 +553,7 @@ async def test_auth_should_work_with_correct_credentials(browser, server): async def test_auth_should_fail_with_wrong_credentials(browser, server): - server.set_auth("/empty.html", b"user", b"pass") + server.set_auth("/empty.html", "user", "pass") context = await browser.new_context( http_credentials={"username": "foo", "password": "bar"} ) @@ -564,7 +564,7 @@ async def test_auth_should_fail_with_wrong_credentials(browser, server): async def test_auth_should_return_resource_body(browser, server): - server.set_auth("/playground.html", b"user", b"pass") + server.set_auth("/playground.html", "user", "pass") context = await browser.new_context( http_credentials={"username": "user", "password": "pass"} ) diff --git a/tests/async/test_defaultbrowsercontext.py b/tests/async/test_defaultbrowsercontext.py index f3e15b61a..1e247ca51 100644 --- a/tests/async/test_defaultbrowsercontext.py +++ b/tests/async/test_defaultbrowsercontext.py @@ -188,7 +188,7 @@ async def test_should_support_http_credentials_option(server, launch_persistent) (page, context) = await launch_persistent( http_credentials={"username": "user", "password": "pass"} ) - server.set_auth("/playground.html", b"user", b"pass") + server.set_auth("/playground.html", "user", "pass") response = await page.goto(server.PREFIX + "/playground.html") assert response.status == 200 diff --git a/tests/async/test_popup.py b/tests/async/test_popup.py index 32da198dc..e740ad76e 100644 --- a/tests/async/test_popup.py +++ b/tests/async/test_popup.py @@ -114,7 +114,7 @@ async def test_should_inherit_offline_from_browser_context(context, server): async def test_should_inherit_http_credentials_from_browser_context( browser: Browser, server ): - server.set_auth("/title.html", b"user", b"pass") + server.set_auth("/title.html", "user", "pass") context = await browser.new_context( http_credentials={"username": "user", "password": "pass"} ) diff --git a/tests/server.py b/tests/server.py index 921774b69..053b60988 100644 --- a/tests/server.py +++ b/tests/server.py @@ -98,8 +98,8 @@ def process(self) -> None: creds_correct = False if authorization_header: creds_correct = auth.get(path) == ( - request.getUser(), - request.getPassword(), + request.getUser().decode(), + request.getPassword().decode(), ) if not creds_correct: request.setHeader(