Merge pull request jaegertracing#137 from jaegertracing/upgrade-to-re…

…act-16

Upgrade to React 16
Signed-off-by: vvvprabhakar <vvvprabhakar@gmail.com>

package.json

@@ -17,7 +17,9 @@
   "devDependencies": {
     "babel-eslint": "^7.2.3",
     "bluebird": "^3.5.0",
-    "enzyme": "^2.9.1",
+    "enzyme": "^3.2.0",
+    "enzyme-adapter-react-16": "^1.1.0",
+    "enzyme-to-json": "^3.3.0",
     "eslint": "^4.5.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-prettier": "^2.3.0",
@@ -55,10 +57,10 @@
     "moment": "^2.18.1",
     "prop-types": "^15.5.10",
     "query-string": "^5.0.0",
-    "react": "^15.6.1",
+    "react": "^16.0.0",
     "react-addons-perf": "^15.4.2",
     "react-dimensions": "^1.3.0",
-    "react-dom": "^15.6.1",
+    "react-dom": "^16.0.0",
     "react-ga": "^2.2.0",
     "react-helmet": "^5.1.3",
     "react-metrics": "^2.3.2",
@@ -98,6 +100,7 @@
     "collectCoverageFrom": [
       "src/**/*.js",
       "!src/utils/DraggableManager/demo/*.js",
+      "!src/utils/test/**/*.js",
       "!src/demo/**/*.js"
     ]
   },

src/components/SearchTracePage/TraceResultsScatterPlot.test.js

@@ -26,7 +26,8 @@ it('<TraceResultsScatterPlot /> should render base case correctly', () => {
         { x: Date.now() - 1000, y: 2, traceID: 2 },
         { x: Date.now(), y: 3, traceID: 3 },
       ]}
-    />
+    />,
+    { disableLifecycleMethods: true }
   );
   expect(wrapper).toBeTruthy();
 });

src/components/SearchTracePage/index.test.js

@@ -65,11 +65,12 @@ describe('<SearchTracePage>', () => {
   });
 
   it('searches for traces if `service` or `traceID` are in the query string', () => {
-    wrapper = mount(<SearchTracePage {...props} />);
     expect(props.searchTraces.mock.calls.length).toBe(1);
   });
 
   it('loads the services and operations if a service is stored', () => {
+    props.fetchServices.mockClear();
+    props.fetchServiceOperations.mockClear();
     const oldFn = store.get;
     store.get = jest.fn(() => ({ service: 'svc-b' }));
     wrapper = mount(<SearchTracePage {...props} />);