fix tests

Author: AnnMarieW

components/dash-core-components/src/components/Loading.react.js

@@ -127,16 +127,19 @@ const Loading = ({
 
     return (
         <div
+            style={{position: 'relative', ...parent_style}}
             className={parent_className}
-            style={
-                showSpinner
-                    ? {position: 'relative', ...parent_style}
-                    : parent_style
-            }
         >
             <div
+                className={parent_className}
                 style={
-                    showSpinner ? {visibility: 'hidden', ...overlay_style} : {}
+                    showSpinner
+                        ? {
+                              visibility: 'hidden',
+                              ...overlay_style,
+                              ...parent_style,
+                          }
+                        : parent_style
                 }
             >
                 {children}

components/dash-core-components/tests/integration/loading/test_loading_component.py

@@ -406,7 +406,7 @@ def updateDiv(n_clicks):
         dash_dcc.find_element(".loading .dash-spinner")
         # unlike the default, the content should be visible
         dash_dcc.wait_for_text_to_equal("#div-1", "content")
-        dash_dcc.wait_for_style_to_equal("#root > div", "opacity", "0.5")
+        dash_dcc.wait_for_style_to_equal("#root > div > div", "opacity", "0.5")
 
     dash_dcc.wait_for_text_to_equal("#div-1", "changed")