From 1019e45940923792dec814957cc13550e5d0692d Mon Sep 17 00:00:00 2001
From: David Kaltschmidt <david.kaltschmidt@gmail.com>
Date: Wed, 11 Nov 2015 18:24:09 +0100
Subject: [PATCH] Upgrade node version to v4.2.2, and jest to 0.7.1

* the jest update will allow for jest --watch to keep jest running
---
 client/Dockerfile                               |  2 +-
 .../components/__tests__/node-details-test.js   |  5 ++---
 client/package.json                             | 17 ++++++++---------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/client/Dockerfile b/client/Dockerfile
index df9129dde..5f80b3d02 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:0.10
+FROM node:4.2.2
 WORKDIR /home/weave
 COPY package.json /home/weave/
 # Dont install optional developer tools
diff --git a/client/app/scripts/components/__tests__/node-details-test.js b/client/app/scripts/components/__tests__/node-details-test.js
index 0edc74f15..6082964b0 100644
--- a/client/app/scripts/components/__tests__/node-details-test.js
+++ b/client/app/scripts/components/__tests__/node-details-test.js
@@ -2,8 +2,6 @@ jest.dontMock('../node-details.js');
 jest.dontMock('../../mixins/node-color-mixin');
 jest.dontMock('../../utils/title-utils');
 
-__WS_URL__ = false
-
 describe('NodeDetails', () => {
   let NodeDetails;
   let nodes;
@@ -28,7 +26,8 @@ describe('NodeDetails', () => {
   it('show label of node with title', () => {
     nodes = nodes.set(nodeId, Immutable.fromJS({id: nodeId}));
     details = {label_major: 'Node 1', tables: []};
-    const c = TestUtils.renderIntoDocument(<NodeDetails nodes={nodes} nodeId={nodeId} details={details} />);
+    const c = TestUtils.renderIntoDocument(<NodeDetails nodes={nodes}
+      nodeId={nodeId} details={details} />);
 
     const title = TestUtils.findRenderedDOMComponentWithClass(c, 'node-details-header-label');
     expect(title.textContent).toBe('Node 1');
diff --git a/client/package.json b/client/package.json
index bc11176d3..f19608797 100644
--- a/client/package.json
+++ b/client/package.json
@@ -40,7 +40,7 @@
     "eslint-plugin-jasmine": "1.6.0",
     "eslint-plugin-react": "3.8.0",
     "file-loader": "0.8.4",
-    "jest-cli": "~0.4.19",
+    "jest-cli": "~0.7.1",
     "json-loader": "0.5.3",
     "less": "~2.5.1",
     "less-loader": "2.2.1",
@@ -72,20 +72,19 @@
       "es6",
       "js"
     ],
+    "testPathDirs": [
+      "<rootDir>/app/scripts"
+    ],
+    "globals": {
+      "__WS_URL__": false
+    },
     "moduleFileExtensions": [
       "js",
       "json",
       "es6"
     ],
     "unmockedModulePathPatterns": [
-      "react",
-      "immutable",
-      "d3",
-      "dagre",
-      "keymirror",
-      "object-assign",
-      "lodash",
-      "debug"
+      "/node_modules/"
     ]
   },
   "engines": {