Skip to content

Commit 1a322f0

Browse files
committed
fix: Restore expected responses from Lacus, fix tests
1 parent b19bfc1 commit 1a322f0

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

poetry.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pylacus/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class CaptureResponse(TypedDict, total=False):
4545
status: int
4646
last_redirected_url: str | None
4747
har: dict[str, Any] | None
48-
cookies: list[Cookie] | None
48+
cookies: list[dict[str, Any]] | None
4949
storage: dict[str, Any] | None
5050
error: str | None
5151
html: str | None
@@ -65,7 +65,7 @@ class CaptureResponseJson(TypedDict, total=False):
6565
status: int
6666
last_redirected_url: str | None
6767
har: dict[str, Any] | None
68-
cookies: list[Cookie] | None
68+
cookies: list[dict[str, Any]] | None
6969
storage: dict[str, Any] | None
7070
error: str | None
7171
html: str | None

tests/test_web.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import unittest
66

77
from datetime import datetime
8+
from typing import Any
89

9-
from lookyloo_models import Cookie
1010
from pylacus import PyLacus
1111
from pylacus.api import CaptureStatus
1212

@@ -60,12 +60,12 @@ def test_submit_cookies(self) -> None:
6060
if not response['storage'] or 'cookies' not in response['storage']:
6161
self.fail("No storage found")
6262
self.assertEqual(len(response['cookies']), 1)
63-
self.assertEqual(response['cookies'][0].domain, 'circl.lu')
63+
self.assertEqual(response['cookies'][0]['domain'], 'circl.lu')
6464
self.assertEqual(response['cookies'], response['storage']['cookies'])
6565

66-
cookie_from_capture: Cookie = response['cookies'][0]
66+
cookie_from_capture = response['cookies'][0]
6767
expires = datetime.now().timestamp() + 3600
68-
cookie_from_capture.expires = expires
68+
cookie_from_capture['expires'] = expires
6969
uuid = self.client.enqueue(url="circl.lu", cookies=[cookie_from_capture], max_retries=0)
7070
while True:
7171
status = self.client.get_capture_status(uuid)
@@ -75,12 +75,12 @@ def test_submit_cookies(self) -> None:
7575
response = self.client.get_capture(uuid)
7676
if not response['cookies']:
7777
self.fail("No cookies found")
78-
self.assertEqual(response['cookies'][0].expires, expires)
78+
self.assertEqual(response['cookies'][0]['expires'], expires)
7979

8080
# Send list
81-
cookies_from_capture: list[Cookie] = response['cookies']
81+
cookies_from_capture: list[dict[str, Any]] = response['cookies']
8282
expires = datetime.now().timestamp() + 4000
83-
cookies_from_capture[0].expires = expires
83+
cookies_from_capture[0]['expires'] = expires
8484
uuid = self.client.enqueue(url="circl.lu", cookies=cookies_from_capture, max_retries=0)
8585
while True:
8686
status = self.client.get_capture_status(uuid)
@@ -90,7 +90,7 @@ def test_submit_cookies(self) -> None:
9090
response = self.client.get_capture(uuid)
9191
if not response['cookies']:
9292
self.fail("No cookies found")
93-
self.assertEqual(response['cookies'][0].expires, expires)
93+
self.assertEqual(response['cookies'][0]['expires'], expires)
9494

9595
# Send list as json
9696
cookies_from_capture = response['cookies']
@@ -102,7 +102,7 @@ def test_submit_cookies(self) -> None:
102102
time.sleep(5)
103103
response = self.client.get_capture(uuid)
104104
if response['cookies']:
105-
self.assertEqual(response['cookies'][0].expires, expires, response['cookies'])
105+
self.assertEqual(response['cookies'][0]['expires'], expires, response['cookies'])
106106

107107
def test_submit_storage(self) -> None:
108108
uuid = self.client.enqueue(url="https://mdn.github.io/dom-examples/web-storage/",

0 commit comments

Comments
 (0)