- undo redux_state_rqs regression

- new `redux_state_is_loading` method

Author: Marc-André Rivet

dash/testing/dash_page.py

@@ -36,7 +36,19 @@ def redux_state_paths(self):
     def redux_state_rqs(self):
         return self.driver.execute_script(
             """
-            return !window.store.getState().isLoading;
+            var callbacksState =  Object.assign({}, window.store.getState().callbacks);
+            delete callbacksState.stored;
+            delete callbacksState.completed;
+
+            return Array.prototype.concat.apply([], Object.values(callbacksState));
+            """
+        )
+
+    @property
+    def redux_state_is_loading(self):
+        return self.driver.execute_script(
+            """
+            return window.store.getState().isLoading;
             """
         )
 

tests/integration/callbacks/test_basic_callback.py

@@ -41,7 +41,7 @@ def update_output(value):
 
     assert call_count.value == 2 + len("hello world"), "initial count + each key stroke"
 
-    assert dash_duo.redux_state_rqs
+    assert not dash_duo.redux_state_is_loading
 
     assert dash_duo.get_logs() == []
 
@@ -133,7 +133,7 @@ def update_input(value):
         "#sub-output-1", pad_input.attrs["value"] + "deadbeef"
     )
 
-    assert dash_duo.redux_state_rqs, "loadingMap is empty"
+    assert not dash_duo.redux_state_is_loading, "loadingMap is empty"
 
     dash_duo.percy_snapshot(name="callback-generating-function-2")
     assert dash_duo.get_logs() == [], "console is clean"

tests/integration/callbacks/test_layout_paths_with_callbacks.py

@@ -176,7 +176,7 @@ def check_chapter(chapter):
             TIMEOUT,
         )
 
-        assert dash_duo.redux_state_rqs, "loadingMap is empty"
+        assert not dash_duo.redux_state_is_loading, "loadingMap is empty"
 
     def check_call_counts(chapters, count):
         for chapter in chapters:

tests/integration/callbacks/test_missing_inputs.py

@@ -9,7 +9,7 @@ def wait_for_queue(dash_duo):
     # mostly for cases where no callbacks should fire:
     # just wait until we have the button and the queue is empty
     dash_duo.wait_for_text_to_equal("#btn", "click")
-    wait.until(lambda: dash_duo.redux_state_rqs, 3)
+    wait.until(lambda: not dash_duo.redux_state_is_loading, 3)
 
 
 def test_cbmi001_all_missing_inputs(dash_duo):

tests/integration/callbacks/test_multiple_callbacks.py

@@ -32,7 +32,7 @@ def update_output(n_clicks):
     assert call_count.value == 4, "get called 4 times"
     assert dash_duo.find_element("#output").text == "3", "clicked button 3 times"
 
-    assert dash_duo.redux_state_rqs
+    assert not dash_duo.redux_state_is_loading
 
     dash_duo.percy_snapshot(
         name="test_callbacks_called_multiple_times_and_out_of_order"

tests/integration/renderer/test_dependencies.py

@@ -40,6 +40,6 @@ def update_output_2(value):
 
     assert output_1_call_count.value == 2 and output_2_call_count.value == 0
 
-    assert dash_duo.redux_state_rqs
+    assert not dash_duo.redux_state_is_loading
 
     assert dash_duo.get_logs() == []

tests/integration/renderer/test_due_diligence.py

@@ -95,7 +95,7 @@ def test_rddd001_initial_state(dash_duo):
         )
     }, "paths should reflect to the component hierarchy"
 
-    assert dash_duo.redux_state_rqs, "no callback => no pendingCallbacks"
+    assert not dash_duo.redux_state_is_loading, "no callback => no pendingCallbacks"
 
     dash_duo.percy_snapshot(name="layout")
     assert dash_duo.get_logs() == [], "console has no errors"