commit 40f8fa94fba7471583014f2ab01a3807557b44eb
author Matteo Scandolo <matteo.scandolo@gmail.com> Wed Dec 07 09:21:35 2016 -0800
committer Matteo Scandolo <matteo.scandolo@gmail.com> Thu Dec 08 10:19:05 2016 -0800
tree 9f4535d503b54576530dc23e702e1ee91387465d
parent 0f77c50d7c2f2990b0e6aa59d70c6af213935da9

Added slices

Change-Id: I9dfaa9348fa82da844a04c0c2a58ce07e9fa3a28

conf/app/app.config.dev.ts

diff --git a/conf/app/app.config.dev.ts b/conf/app/app.config.dev.ts
index 749ccc5..7b6fa12 100644
--- a/conf/app/app.config.dev.ts
+++ b/conf/app/app.config.dev.ts
@@ -7,5 +7,5 @@
 
 export const AppConfig: IAppConfig = {
     apiEndpoint: 'http://xos.dev:3000/api',
-    websocketClient: 'http://xos.dev:3000/socket.io/socket.io.js'
+    websocketClient: 'http://xos.dev:3000'
 };

conf/app/app.config.production.ts

diff --git a/conf/app/app.config.production.ts b/conf/app/app.config.production.ts
index 6ae83a4..2357f77 100644
--- a/conf/app/app.config.production.ts
+++ b/conf/app/app.config.production.ts
@@ -7,5 +7,5 @@
 
 export const AppConfig: IAppConfig = {
     apiEndpoint: 'http://xos-rest-gw:3000/api',
-    websocketClient: 'http://xos-rest-gw:3000/socket.io/socket.io.js'
+    websocketClient: 'http://xos-rest-gw:3000'
 };

conf/app/app.config.test.ts

diff --git a/conf/app/app.config.test.ts b/conf/app/app.config.test.ts
index 0b10e64..7d215af 100644
--- a/conf/app/app.config.test.ts
+++ b/conf/app/app.config.test.ts
@@ -7,5 +7,5 @@
 
 export const AppConfig: IAppConfig = {
     apiEndpoint: 'http://xos-test:3000/api',
-    websocketClient: 'http://xos-test:3000/socket.io/socket.io.js'
+    websocketClient: 'http://xos-test:3000'
 };

conf/karma-auto.conf.js

diff --git a/conf/karma-auto.conf.js b/conf/karma-auto.conf.js
index c665d66..b7e44ab 100644
--- a/conf/karma-auto.conf.js
+++ b/conf/karma-auto.conf.js
@@ -10,7 +10,8 @@
       outputDir: 'test-reports'
     },
     browsers: [
-      'Chrome'
+      // 'Chrome',
+      'PhantomJS'
     ],
     frameworks: [
       'jasmine'
@@ -24,7 +25,7 @@
         'webpack'
       ]
     },
-    reporters: ['progress', 'coverage'],
+    reporters: ['mocha', 'coverage'],
     coverageReporter: {
       type: 'html',
       dir: 'coverage/'
@@ -38,6 +39,8 @@
       require('karma-junit-reporter'),
       require('karma-coverage'),
       require('karma-chrome-launcher'),
+      require('karma-phantomjs-launcher'),
+      require('karma-mocha-reporter'),
       require('karma-webpack')
     ]
   };