update loading component tests for new class usage

Author: alexcjohnson

tests/integration/loading/test_loading_component.py

@@ -23,8 +23,10 @@ def updateDiv(children):
     with lock:
         dash_dcc.start_server(app)
         dash_dcc.find_element('.loading .dash-spinner')
+        # ensure inner component is also mounted
+        dash_dcc.wait_for_text_to_equal("#div-1", "")
 
-    dash_dcc.find_element('.loading #div-1')
+    dash_dcc.wait_for_text_to_equal('#div-1', 'content')
 
     assert not dash_dcc.get_logs()
 
@@ -42,19 +44,21 @@ def test_ldcp002_loading_component_action(dash_dcc):
     def updateDiv(n_clicks):
         if n_clicks is not None:
             with lock:
-                return
+                return "changed"
 
         return 'content'
 
     with lock:
         dash_dcc.start_server(app)
-        dash_dcc.find_element('.loading #div-1')
+        dash_dcc.wait_for_text_to_equal('#div-1', "content")
 
         dash_dcc.find_element('#root').click()
 
         dash_dcc.find_element('.loading .dash-spinner')
+        # mounted but hidden, so looks like no text
+        dash_dcc.wait_for_text_to_equal('#div-1', "")
 
-    dash_dcc.find_element('.loading #div-1')
+    dash_dcc.wait_for_text_to_equal('#div-1', "changed")
 
     assert not dash_dcc.get_logs()
 
@@ -69,42 +73,42 @@ def test_ldcp003_multiple_loading_components(dash_dcc):
         dcc.Loading([html.Button(id='btn-2')], className='loading-2')
     ], id='root')
 
-    @app.callback(Output('btn-1', 'value'), [Input('btn-2', 'n_clicks')])
+    @app.callback(Output('btn-1', 'children'), [Input('btn-2', 'n_clicks')])
     def updateDiv(n_clicks):
         if n_clicks is not None:
             with lock:
-                return
+                return "changed 1"
 
-        return 'content'
+        return 'content 1'
 
-    @app.callback(Output('btn-2', 'value'), [Input('btn-1', 'n_clicks')])
+    @app.callback(Output('btn-2', 'children'), [Input('btn-1', 'n_clicks')])
     def updateDiv(n_clicks):
         if n_clicks is not None:
             with lock:
-                return
+                return "changed 2"
 
-        return 'content'
+        return 'content 2'
 
     dash_dcc.start_server(app)
 
-    dash_dcc.find_element('.loading-1 #btn-1')
-    dash_dcc.find_element('.loading-2 #btn-2')
+    dash_dcc.wait_for_text_to_equal('#btn-1', "content 1")
+    dash_dcc.wait_for_text_to_equal('#btn-2', "content 2")
 
     with lock:
         dash_dcc.find_element('#btn-1').click()
 
         dash_dcc.find_element('.loading-2 .dash-spinner')
-        dash_dcc.find_element('.loading-1 #btn-1')
+        dash_dcc.wait_for_text_to_equal("#btn-2", "")
 
-    dash_dcc.find_element('.loading-2 #btn-2')
+    dash_dcc.wait_for_text_to_equal("#btn-2", "changed 2")
 
     with lock:
         dash_dcc.find_element('#btn-2').click()
 
         dash_dcc.find_element('.loading-1 .dash-spinner')
+        dash_dcc.wait_for_text_to_equal("#btn-1", "")
 
-    dash_dcc.find_element('.loading-1 #btn-1')
-    dash_dcc.find_element('.loading-2 #btn-2')
+    dash_dcc.wait_for_text_to_equal("#btn-1", "changed 1")
 
     assert not dash_dcc.get_logs()
 
@@ -121,51 +125,50 @@ def test_ldcp004_nested_loading_components(dash_dcc):
         ], className='loading-1')
     ], id='root')
 
-    @app.callback(Output('btn-1', 'value'), [Input('btn-2', 'n_clicks')])
+    @app.callback(Output('btn-1', 'children'), [Input('btn-2', 'n_clicks')])
     def updateDiv(n_clicks):
         if n_clicks is not None:
             with lock:
-                return
+                return "changed 1"
 
-        return 'content'
+        return 'content 1'
 
-    @app.callback(Output('btn-2', 'value'), [Input('btn-1', 'n_clicks')])
+    @app.callback(Output('btn-2', 'children'), [Input('btn-1', 'n_clicks')])
     def updateDiv(n_clicks):
         if n_clicks is not None:
             with lock:
-                return
+                return "changed 2"
 
-        return 'content'
+        return 'content 2'
 
     dash_dcc.start_server(app)
 
-    dash_dcc.find_element('.loading-1 #btn-1')
-    dash_dcc.find_element('.loading-2 #btn-2')
+    dash_dcc.wait_for_text_to_equal('#btn-1', "content 1")
+    dash_dcc.wait_for_text_to_equal('#btn-2', "content 2")
 
     with lock:
         dash_dcc.find_element('#btn-1').click()
 
         dash_dcc.find_element('.loading-2 .dash-spinner')
-        dash_dcc.find_element('.loading-1 #btn-1')
+        dash_dcc.wait_for_text_to_equal("#btn-2", "")
 
-    dash_dcc.find_element('.loading-2 #btn-2')
+    dash_dcc.wait_for_text_to_equal("#btn-2", "changed 2")
 
     with lock:
         dash_dcc.find_element('#btn-2').click()
 
         dash_dcc.find_element('.loading-1 .dash-spinner')
+        dash_dcc.wait_for_text_to_equal("#btn-1", "")
 
-    dash_dcc.find_element('.loading-1 #btn-1')
-    dash_dcc.find_element('.loading-2 #btn-2')
+    dash_dcc.wait_for_text_to_equal("#btn-1", "changed 1")
 
     assert not dash_dcc.get_logs()
 
 
 def test_ldcp005_dynamic_loading_component(dash_dcc):
     lock = Lock()
 
-    app = dash.Dash(__name__)
-    app.config['suppress_callback_exceptions'] = True
+    app = dash.Dash(__name__, suppress_callback_exceptions=True)
 
     app.layout = html.Div([html.Button(id='btn-1'), html.Div(id='div-1')])
 
@@ -180,30 +183,30 @@ def updateDiv(n_clicks):
                 dcc.Loading([html.Button(id='btn-3')], className='loading-1')
             ])
 
-    @app.callback(Output('btn-3', 'content'), [Input('btn-2', 'n_clicks')])
+    @app.callback(Output('btn-3', 'children'), [Input('btn-2', 'n_clicks')])
     def updateDynamic(n_clicks):
         if n_clicks is None:
-            return
+            return "content"
 
         with lock:
-            return 'content'
+            return "changed"
 
     dash_dcc.start_server(app)
 
     dash_dcc.find_element('#btn-1')
-    dash_dcc.find_element('#div-1')
+    dash_dcc.wait_for_text_to_equal('#div-1', "")
 
     dash_dcc.find_element('#btn-1').click()
 
     dash_dcc.find_element('#div-1 #btn-2')
-    dash_dcc.find_element('.loading-1 #btn-3')
+    dash_dcc.wait_for_text_to_equal('#btn-3', "content")
 
     with lock:
         dash_dcc.find_element('#btn-2').click()
 
         dash_dcc.find_element('.loading-1 .dash-spinner')
+        dash_dcc.wait_for_text_to_equal('#btn-3', "")
 
-    dash_dcc.find_element('#div-1 #btn-2')
-    dash_dcc.find_element('.loading-1 #btn-3')
+    dash_dcc.wait_for_text_to_equal('#btn-3', "changed")
 
     assert not dash_dcc.get_logs()