Merge + review pie test

client/src/tests/elements/Pie.test.tsx

@@ -9,9 +9,8 @@ import { Spinner, SpinnerActions } from '../../components/Spinner';
 import PieData from '../../components/generic/PieData';
 import { DataSourceConnector, IDataSourceDictionary } from '../../data-sources';
 
-//import dataSourceMock from '../mocks/dataSource';
 import dashboardMock from '../mocks/dashboards/pie';
-import ElementConnector from "../../components/ElementConnector";
+import ElementConnector from '../../components/ElementConnector';
 
 describe('Pie', () => {
 
@@ -40,11 +39,13 @@ describe('Pie', () => {
           subtitle);
         pie = TestUtils.renderIntoDocument(pieElement);
         TestUtils.isElementOfType(pie, 'div');
+
+        // Adding a timeout to make sure Flux cycle is complete
+        setTimeout(done, 100);
+        
+      } catch (e) {
+        return done(e);
       }
-      catch (e) {
-        console.error(e);
-      }
-      setTimeout(done, 100);
 
     }, 100);
   })

client/yarn.lock

@@ -4486,13 +4486,7 @@ react-dom@^15.4.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-react-draggable@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-2.2.3.tgz#17628cb8aaefed639d38e0021b978a685d80b08b"
-  dependencies:
-    classnames "^2.2.5"
-
-react-draggable@^2.2.6:
+react-draggable@^2.1.0, react-draggable@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-2.2.6.tgz#3a806e10f2da6babfea4136be6510e89b0d76901"
   dependencies: