Skip to content

Commit 5c53deb

Browse files
Lightning00BladeLightning00Blade
committed
chore: update E2E tests
1 parent 8f26e8d commit 5c53deb

File tree

7 files changed

+73
-41
lines changed

7 files changed

+73
-41
lines changed

‎tests/browsing_context/__snapshots__/test_close.ambr

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
'method': 'browsingContext.contextDestroyed',
55
'params': dict({
66
'children': None,
7+
'originalOpener': None,
78
'parent': None,
89
'url': "data:text/html,%0A <script>%0A window.addEventListener('beforeunload', event => {%0A event.returnValue = 'Leave?%27;%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20event.preventDefault();%0A%20%20%20%20%20%20%20%20%20%20%20%20});%0A%20%20%20%20%20%20%20%20%3C/script%3E",
910
'userContext': 'default',

‎tests/browsing_context/test_close.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
import pytest
1616
from syrupy.filters import paths
17-
from test_helpers import (execute_command, get_tree, goto_url,
17+
from test_helpers import (AnyExtending, execute_command, get_tree, goto_url,
1818
read_JSON_message, send_JSON_command, subscribe,
1919
wait_for_event)
2020

@@ -32,7 +32,7 @@ async def test_browsingContext_close(websocket, context_id):
3232

3333
# Assert "browsingContext.contextCreated" event emitted.
3434
resp = await read_JSON_message(websocket)
35-
assert resp == {
35+
assert resp == AnyExtending({
3636
'type': 'event',
3737
"method": "browsingContext.contextDestroyed",
3838
"params": {
@@ -42,7 +42,7 @@ async def test_browsingContext_close(websocket, context_id):
4242
"children": None,
4343
"userContext": "default"
4444
}
45-
}
45+
})
4646

4747
resp = await read_JSON_message(websocket)
4848
assert resp == {"type": "success", "id": command_id, "result": {}}

‎tests/browsing_context/test_create.py

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ async def test_browsingContext_create_eventContextCreatedEmitted(
6767
"url": "about:blank",
6868
"children": None,
6969
"parent": None,
70-
"userContext": "default"
70+
"userContext": "default",
71+
"originalOpener": None
7172
}
7273
} == context_created_event
7374

@@ -132,18 +133,21 @@ async def test_browsingContext_createWithNestedSameOriginContexts_eventContextCr
132133
"parent": None,
133134
"url": top_level_page,
134135
"userContext": "default",
136+
"originalOpener": None,
135137
"children": [
136138
{
137139
"context": ANY_STR,
138140
# It's not guaranteed the nested page is already loaded.
139141
"url": ANY_STR,
140142
"userContext": "default",
143+
"originalOpener": None,
141144
"children": [{
142145
"context": ANY_STR,
143146
# It's not guaranteed the nested page is already loaded.
144147
"url": ANY_STR,
145148
"userContext": "default",
146-
"children": []
149+
"children": [],
150+
"originalOpener": None
147151
}]
148152
},
149153
]
@@ -154,7 +158,7 @@ async def test_browsingContext_createWithNestedSameOriginContexts_eventContextCr
154158
"context"]
155159
nested_iframe_context_id = \
156160
tree["contexts"][0]["children"][0]["children"][0]["context"]
157-
assert events[0] == {
161+
assert events[0] == AnyExtending({
158162
'type': 'event',
159163
"method": "browsingContext.contextCreated",
160164
"params": {
@@ -164,9 +168,9 @@ async def test_browsingContext_createWithNestedSameOriginContexts_eventContextCr
164168
'url': 'about:blank',
165169
'userContext': 'default'
166170
}
167-
}
171+
})
168172

169-
assert events[1] == {
173+
assert events[1] == AnyExtending({
170174
'type': 'event',
171175
"method": "browsingContext.contextCreated",
172176
"params": {
@@ -176,7 +180,7 @@ async def test_browsingContext_createWithNestedSameOriginContexts_eventContextCr
176180
'url': 'about:blank',
177181
'userContext': 'default'
178182
}
179-
}
183+
})
180184

181185

182186
@pytest.mark.asyncio
@@ -235,7 +239,8 @@ async def test_browsingContext_create_withUserGesture_eventsEmitted(
235239
'url': 'about:blank',
236240
'children': None,
237241
'parent': None,
238-
'userContext': 'default'
242+
'userContext': 'default',
243+
'originalOpener': ANY_STR,
239244
}
240245
}, {
241246
'type': 'event',
@@ -287,13 +292,13 @@ async def test_browsingContext_create_withUserContext(websocket, type):
287292

288293
assert len(tree['contexts']) == 2
289294

290-
assert tree["contexts"][1] == {
295+
assert tree["contexts"][1] == AnyExtending({
291296
'context': result['context'],
292297
'url': 'about:blank',
293298
'userContext': user_context["userContext"],
294299
'children': [],
295300
'parent': None
296-
}
301+
})
297302

298303

299304
@pytest.mark.asyncio
@@ -314,8 +319,8 @@ async def test_browsingContext_subscribe_to_contextCreated_emits_for_existing(
314319
],
315320
# Missing "contexts" means global subscription.
316321
**({} if global_subscription else {
317-
"contexts": [another_context_id]
318-
})
322+
"contexts": [another_context_id]
323+
})
319324
}
320325
})
321326

‎tests/browsing_context/test_get_tree.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ async def test_browsingContext_getTree_contextReturned(websocket, context_id):
2727
"children": [],
2828
"parent": None,
2929
"url": "about:blank",
30-
"userContext": "default"
30+
"userContext": "default",
31+
"originalOpener": None
3132
}]
3233
}
3334

@@ -54,7 +55,8 @@ async def test_browsingContext_getTreeWithRoot_contextReturned(websocket):
5455
"parent": None,
5556
"url": "about:blank",
5657
"children": [],
57-
"userContext": "default"
58+
"userContext": "default",
59+
"originalOpener": None
5860
}]
5961
}
6062

@@ -78,11 +80,13 @@ async def test_browsingContext_afterNavigation_getTreeWithNestedCrossOriginConte
7880
"context": ANY_STR,
7981
"url": another_example_url,
8082
"children": [],
81-
"userContext": "default"
83+
"userContext": "default",
84+
"originalOpener": None
8285
}],
8386
"parent": None,
8487
"url": another_page_with_nested_iframe,
85-
"userContext": "default"
88+
"userContext": "default",
89+
"originalOpener": None
8690
}]
8791
} == result
8892

@@ -108,11 +112,13 @@ async def test_browsingContext_afterNavigation_getTreeWithNestedContexts_context
108112
"context": ANY_STR,
109113
"url": nested_iframe,
110114
"children": [],
111-
"userContext": "default"
115+
"userContext": "default",
116+
"originalOpener": None
112117
}],
113118
"parent": None,
114119
"url": page_with_nested_iframe,
115-
"userContext": "default"
120+
"userContext": "default",
121+
"originalOpener": None
116122
}]
117123
} == result
118124

@@ -127,10 +133,12 @@ async def test_browsingContext_afterNavigation_getTreeWithNestedContexts_context
127133
"context": ANY_STR,
128134
"url": another_nested_iframe,
129135
"children": [],
130-
"userContext": "default"
136+
"userContext": "default",
137+
"originalOpener": None
131138
}],
132139
"parent": None,
133140
"url": another_page_with_nested_iframe,
134-
"userContext": "default"
141+
"userContext": "default",
142+
"originalOpener": None
135143
}]
136144
} == result

‎tests/browsing_context/test_navigate.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitInteractive_na
235235
"children": [],
236236
"parent": None,
237237
"url": url_with_hash_1,
238-
"userContext": "default"
238+
"userContext": "default",
239+
"originalOpener": None
239240
}]
240241
} == result
241242

@@ -251,7 +252,8 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitInteractive_na
251252
"children": [],
252253
"parent": None,
253254
"url": url_with_hash_2,
254-
"userContext": "default"
255+
"userContext": "default",
256+
"originalOpener": None
255257
}]
256258
} == result
257259

@@ -277,7 +279,8 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitComplete_navig
277279
"children": [],
278280
"parent": None,
279281
"url": url_with_hash_1,
280-
"userContext": "default"
282+
"userContext": "default",
283+
"originalOpener": None
281284
}]
282285
} == result
283286

@@ -292,7 +295,8 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitComplete_navig
292295
"children": [],
293296
"parent": None,
294297
"url": url_with_hash_2,
295-
"userContext": "default"
298+
"userContext": "default",
299+
"originalOpener": None
296300
}]
297301
} == result
298302

@@ -314,7 +318,8 @@ async def test_navigateToPageWithHash_contextInfoUpdated(
314318
"children": [],
315319
"parent": None,
316320
"url": url_with_hash_1,
317-
"userContext": "default"
321+
"userContext": "default",
322+
"originalOpener": None
318323
}]
319324
}
320325

@@ -448,7 +453,7 @@ async def test_browsingContext_navigateBadSsl_notNavigated(
448453
'acceptInsecureCerts': True
449454
}
450455
}],
451-
indirect=['websocket'])
456+
indirect=['websocket'])
452457
async def test_browsingContext_navigateBadSslAndAcceptInsecureCerts_navigated(
453458
websocket, context_id, bad_ssl_url):
454459
await execute_command(

‎tests/browsing_context/test_nested_browsing_context.py

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ async def test_nestedBrowsingContext_navigateToPageWithHash_contextInfoUpdated(
3636
"children": [],
3737
"parent": ANY_STR,
3838
"url": url_with_hash_1,
39-
"userContext": "default"
39+
"userContext": "default",
40+
"originalOpener": None
4041
}]
4142
} == result
4243

@@ -194,7 +195,8 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitInteract
194195
"children": [],
195196
"parent": ANY_STR,
196197
"url": url_with_hash_1,
197-
"userContext": "default"
198+
"userContext": "default",
199+
"originalOpener": None
198200
}]
199201
} == result
200202

@@ -209,7 +211,8 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitInteract
209211
"children": [],
210212
"parent": ANY_STR,
211213
"url": url_with_hash_2,
212-
"userContext": "default"
214+
"userContext": "default",
215+
"originalOpener": None
213216
}]
214217
} == result
215218

@@ -235,7 +238,8 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitComplete
235238
"children": [],
236239
"parent": ANY_STR,
237240
"url": url_with_hash_1,
238-
"userContext": "default"
241+
"userContext": "default",
242+
"originalOpener": None
239243
}]
240244
} == result
241245

@@ -250,7 +254,8 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitComplete
250254
"children": [],
251255
"parent": ANY_STR,
252256
"url": url_with_hash_2,
253-
"userContext": "default"
257+
"userContext": "default",
258+
"originalOpener": None
254259
}]
255260
} == result
256261

@@ -273,11 +278,13 @@ async def test_nestedBrowsingContext_afterNavigation_getTreeWithNestedCrossOrigi
273278
"context": ANY_STR,
274279
"url": another_example_url,
275280
"children": [],
276-
"userContext": "default"
281+
"userContext": "default",
282+
"originalOpener": None
277283
}],
278284
"parent": ANY_STR,
279285
"url": another_page_with_nested_iframe,
280-
"userContext": "default"
286+
"userContext": "default",
287+
"originalOpener": None
281288
}]
282289
} == result
283290

@@ -306,10 +313,12 @@ async def test_nestedBrowsingContext_afterNavigation_getTreeWithNestedContexts_c
306313
"context": ANY_STR,
307314
"url": another_nested_iframe,
308315
"children": [],
309-
"userContext": "default"
316+
"userContext": "default",
317+
"originalOpener": None
310318
}],
311319
"parent": ANY_STR,
312-
"userContext": "default"
320+
"userContext": "default",
321+
"originalOpener": None
313322
}]
314323
} == result
315324

@@ -329,11 +338,13 @@ async def test_browsingContext_addAndRemoveNestedContext_contextAddedAndRemoved(
329338
"context": ANY_STR,
330339
"url": url_cross_origin,
331340
"children": [],
332-
"userContext": "default"
341+
"userContext": "default",
342+
"originalOpener": None
333343
}],
334344
"parent": None,
335345
"url": page_with_nested_iframe,
336-
"userContext": "default"
346+
"userContext": "default",
347+
"originalOpener": None
337348
}]
338349
} == result
339350

@@ -358,6 +369,7 @@ async def test_browsingContext_addAndRemoveNestedContext_contextAddedAndRemoved(
358369
"children": [],
359370
"parent": None,
360371
"url": page_with_nested_iframe,
361-
"userContext": "default"
372+
"userContext": "default",
373+
"originalOpener": None
362374
}]
363375
} == result

‎tests/session/test_subscription.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ async def test_subscribeWithContext_subscribesToEventsInNestedContext(
124124
"url": url_same_origin,
125125
"children": None,
126126
"parent": context_id,
127-
"userContext": "default"
127+
"userContext": "default",
128+
"originalOpener": None
128129
}
129130
} == resp
130131

0 commit comments

Comments
 (0)