Test fixed.

There seems to be an issue with the latest version of isparta-instrumenter-loader. So, for now, we are on v0.2.3
Dindaleon · Jan 1, 2016 · b1e2a4b · b1e2a4b
1 parent 4e37479
commit b1e2a4b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/karma.config.js b/karma.config.js
@@ -2,9 +2,6 @@
 /* jscs: disable */
 
 // Karma configuration
-
-var webpack = require('webpack');
-
 module.exports = function(config) {
   config.set({
 
@@ -55,8 +52,12 @@ module.exports = function(config) {
         loaders: [
           {
             exclude: /node_modules/,
-            loader: 'babel-loader',
-            test: /\.js?$/
+            loader: 'babel',
+            test: /\.js?$/,
+            query: {
+              presets: [ 'es2015', 'react', 'stage-0' ],
+              plugins: [ 'transform-decorators-legacy', 'transform-runtime' ]
+            }
           }
         ]
       }

diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "extract-text-webpack-plugin": "^0.9.1",
     "hapi-webpack-plugin": "^1.2.1",
     "isparta": "^4.0.0",
-    "isparta-instrumenter-loader": "^1.0.0",
+    "isparta-instrumenter-loader": "^0.2.3",
     "istanbul": "^0.4.0",
     "jscs": "^2.3.2",
     "json-loader": "^0.5.3",
@@ -121,7 +121,7 @@
     "mocha": "^2.3.3",
     "mocha-lcov-reporter": "^1.0.0",
     "nodemon": "^1.7.3",
-    "react-addons-test-utils": "^0.14.0",
+    "react-addons-test-utils": "^0.14.5",
     "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",
     "redbox-react": "^1.1.1",

diff --git a/src/globals.js b/src/globals.js
@@ -19,7 +19,7 @@ let defaultRedisDbNumber = 1;
 if ( __PRODUCTION__ ) {
   defaultServerHOST = 'localhost';
   defaultServerPORT = 8080;
-  defaultWsHost = 'localhost';
+  defaultWsHost = 'http://hapi-reactstarterkit.rhcloud.com';
   defaultWsPort = 8000;
   defaultRedisHost = 'localhost';
   defaultRedisPort = 6379;

diff --git a/src/server.js b/src/server.js
@@ -51,18 +51,27 @@ export default function( callback ) {
     labels: [ 'api' ],
     routes: {
       cors: {
-        origin: [ PROTOCOL + SERVER_HOST + ':' + WS_PORT ]
+        origin: [ PROTOCOL + WS_HOST + ':' + WS_PORT ]
+      }
+    }
+  });
+  server.connection({
+    host: SERVER_HOST,
+    port: WS_PORT,
+    labels: [ 'ws' ],
+    routes: {
+      cors: {
+        origin: [ PROTOCOL + WS_HOST + ':' + SERVER_PORT ]
       }
     }
   });
-  server.connection({ host: SERVER_HOST, port: WS_PORT, labels: [ 'ws' ] });
 
   // Set names for each connection
   server.connections[0].name = 'API';
   server.connections[1].name = 'WS';
 
   const apiServer = server.select('api');
-  const wsServer = server.select('ws');
+  // const wsServer = server.select('ws');
 
   server.register([
     {
@@ -81,7 +90,7 @@ export default function( callback ) {
     }, {
       register: rooms,
       options: {
-        server: wsServer
+        server: apiServer
       }
     }
   ], (err) => {