Tightened up some tests.

vasl_templates/webapp/tests/test_capabilities.py

@@ -868,8 +868,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
 
     def get_sortable_elem():
         """Find the sortable element for the test vehicle."""
-        sortable = find_child( "#ob_vehicles-sortable_1" )
+        elems = find_children( "#ob_vehicles-sortable_1 li" )
-        elems = find_children( "li", sortable )
         assert len(elems) == 1
         return elems[0]
     def check_elite( expected, custom ):

vasl_templates/webapp/tests/test_online_images.py

@@ -96,8 +96,7 @@ def test_multiple_images( webapp, webdriver ):
     )
 
     # select the second image for the vehicle
-    sortable = find_child( "#ob_vehicles-sortable_1" )
+    elems = find_children( "#ob_vehicles-sortable_1 li" )
-    elems = find_children( "li", sortable )
     assert len(elems) == 1
     ActionChains(webdriver).double_click( elems[0] ).perform()
     btn = wait_for_elem( 2, "#edit-vo input.select-vo-image" )

vasl_templates/webapp/tests/test_snippets.py

@@ -50,13 +50,13 @@ def test_snippet_ids( webapp, webdriver ):
         set_scenario_date( scenario_date )
 
         # check each snippet
-        snippet_btns = find_snippet_buttons()
         for tab_id,btns in snippet_btns.items():
             select_tab( tab_id )
             for btn in btns:
                 check_snippet( btn )
 
     # test snippets with German/Russian
+    snippet_btns = find_snippet_buttons()
     do_test( "" )
     do_test( "10/01/1943" )
     do_test( "01/01/1944" )
@@ -67,6 +67,7 @@ def test_snippet_ids( webapp, webdriver ):
         "PLAYER_1": "british", "PLAYER_2": "american",
         "COMPASS": "right",
     } )
+    snippet_btns = find_snippet_buttons()
     do_test( "" )
     do_test( "11/01/1942" )
 

vasl_templates/webapp/tests/test_user_settings.py

@@ -235,6 +235,7 @@ def test_vo_notes_as_images( webapp, webdriver ):
     # initialize
     webapp.control_tests.set_vo_notes_dir( "{TEST}" )
     init_webapp( webapp, webdriver, scenario_persistence=1 )
+    vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
 
     # load the test vehicle
     load_scenario( {
@@ -245,8 +246,7 @@ def test_vo_notes_as_images( webapp, webdriver ):
 
     def check_snippet( expected ):
         """Generate and check the vehicle note snippet."""
-        sortable = find_child( "#ob_vehicles-sortable_1" )
+        elems = find_children( "li", vehicles_sortable )
-        elems = find_children( "li", sortable )
         assert len(elems) == 1
         btn = find_child( "img.snippet", elems[0] )
         btn.click()

vasl_templates/webapp/tests/test_vasl_extensions.py

@@ -167,8 +167,7 @@ def test_kgs_extensions( webapp, webdriver ):
         add_vo( webdriver, "vehicles", 2, veh_name )
 
         # edit the vehicle
-        vehicles_sortable = find_child( "#ob_vehicles-sortable_2" )
+        elems = find_children( "#ob_vehicles-sortable_2 li" )
-        elems = find_children( "li", vehicles_sortable )
         ActionChains(webdriver).double_click( elems[-1] ).perform()
         dlg = find_child( ".ui-dialog.edit-vo" )
 
@@ -272,8 +271,7 @@ def test_bfp_extensions( webapp, webdriver ):
     ], transform=_extract_extn_ma_notes )
 
     # test the Chapter H note
-    vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
+    elems = find_children( "#ob_vehicles-sortable_1 li img.snippet" )
-    elems = find_children( "li img.snippet", vehicles_sortable )
     assert len(elems) == 2
     elems[0].click()
     wait_for_clipboard( 2, "By 1935 the latest European tanks", contains=True )

vasl_templates/webapp/tests/test_vehicles_ordnance.py

@@ -478,10 +478,11 @@ def test_vo_images( webapp, webdriver ): #pylint: disable=too-many-statements
         .set_data_dir( "{REAL}" ) \
         .set_vasl_version( "random", None )
     init_webapp( webapp, webdriver, scenario_persistence=1 )
+    vehicle_sortables = [ find_child( "#ob_vehicles-sortable_1" ), find_child( "#ob_vehicles-sortable_2" ) ]
 
     def check_sortable2_entries( player_no, expected ):
         """Check the settings on the player's vehicles."""
-        entries = find_children( "#ob_vehicles-sortable_{} li".format( player_no ) )
+        entries = find_children( "li", vehicle_sortables[player_no-1] )
         for i,entry in enumerate(entries):
             # check the displayed image
             elem = find_child( "img", entry )