@@ -53,6 +53,7 @@ def setUp(self):
53
53
)
54
54
55
55
def tearDown (self ):
56
+ super ().tearDown ()
56
57
# Accept unsaved changes alert to allow other tests to run
57
58
try :
58
59
self .web_driver .refresh ()
@@ -147,6 +148,11 @@ def save_device():
147
148
)
148
149
)
149
150
)
151
+ WebDriverWait (self .web_driver , 1 ).until (
152
+ EC .invisibility_of_element_located (
153
+ (By .CSS_SELECTOR , '#loading-overlay' )
154
+ )
155
+ )
150
156
# JSONSchema Editor should not be rendered without a change in the image field
151
157
WebDriverWait (self .web_driver , 1 ).until (
152
158
EC .invisibility_of_element_located (
@@ -275,6 +281,12 @@ def test_batch_upgrade_upgrade_options(self, *args):
275
281
self .web_driver .find_element (
276
282
by = By .CSS_SELECTOR , value = 'input[name="upgrade_all"]'
277
283
).click ()
284
+ try :
285
+ WebDriverWait (self .web_driver , 5 ).until (
286
+ EC .url_contains ('batchupgradeoperation' )
287
+ )
288
+ except TimeoutException :
289
+ self .fail ('User was not redirected to Mass upgrade operations page' )
278
290
self .assertEqual (
279
291
BatchUpgradeOperation .objects .filter (
280
292
upgrade_options = {
@@ -326,6 +338,9 @@ def test_upgrader_with_unsupported_upgrade_options(self, *args):
326
338
)
327
339
)
328
340
)
341
+ WebDriverWait (self .web_driver , 5 ).until (
342
+ EC .visibility_of_element_located ((By .ID , 'id_devicefirmware-0-image' ))
343
+ )
329
344
image_select = Select (
330
345
self .web_driver .find_element (
331
346
by = By .ID , value = 'id_devicefirmware-0-image'
0 commit comments