From 87cc80f9379a7cc6ee49dd16baa40a561e59e988 Mon Sep 17 00:00:00 2001
From: Andrew Koroluk <koroluka@gmail.com>
Date: Sun, 25 Feb 2018 20:14:09 -0800
Subject: [PATCH 1/2] test(gen): enable E2E tests during gen CI testing

---
 src/test/main.test.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/main.test.js b/src/test/main.test.js
index 700d98b42..771c8907d 100644
--- a/src/test/main.test.js
+++ b/src/test/main.test.js
@@ -132,9 +132,9 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      it.skip('should run e2e tests successfully', function() {
+      it('should run e2e tests successfully', function() {
         this.retries(2);
-        return runCmd('gulp test:e2e').should.be.fulfilled();
+        return runCmd('npm run test:e2e').should.be.fulfilled();
       });
 
       it.skip('should run e2e tests successfully for production app', function() {
@@ -244,7 +244,7 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      it.skip('should run e2e tests successfully', function() {
+      it('should run e2e tests successfully', function() {
         this.retries(2);
         return runCmd('gulp test:e2e').should.be.fulfilled();
       });
@@ -317,7 +317,7 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      it.skip('should run e2e tests successfully', function() {
+      it('should run e2e tests successfully', function() {
         this.retries(2);
         return runCmd('gulp test:e2e').should.be.fulfilled();
       });
@@ -390,7 +390,7 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      it.skip('should run e2e tests successfully', function() {
+      it('should run e2e tests successfully', function() {
         this.retries(2);
         return runCmd('gulp test:e2e').should.be.fulfilled();
       });

From b98bb696d9a8b7c86cf17470a68cf2ffe5f0071b Mon Sep 17 00:00:00 2001
From: Andrew Koroluk <koroluka@gmail.com>
Date: Sun, 25 Feb 2018 20:44:09 -0800
Subject: [PATCH 2/2] test(gen): add script to create primus client lib

fixes e2e tests error
---
 src/test/get-expected-files.js                   |  3 ++-
 src/test/main.test.js                            |  6 +++---
 templates/app/_package.json                      |  3 ++-
 templates/app/server/config/create_primus(ws).js | 13 +++++++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 templates/app/server/config/create_primus(ws).js

diff --git a/src/test/get-expected-files.js b/src/test/get-expected-files.js
index 4944e40f2..0af879f5f 100644
--- a/src/test/get-expected-files.js
+++ b/src/test/get-expected-files.js
@@ -206,7 +206,8 @@ export function app(options) {
       'client/components/socket/socket.service.' + script,
       'client/components/socket/socket.mock.' + script,
       'server/api/thing/thing.socket.js',
-      'server/config/websockets.js'
+      'server/config/create_primus.js',
+      'server/config/websockets.js',
     ]);
   }
 
diff --git a/src/test/main.test.js b/src/test/main.test.js
index 771c8907d..fe0fa6c23 100644
--- a/src/test/main.test.js
+++ b/src/test/main.test.js
@@ -246,7 +246,7 @@ describe('angular-fullstack:app', function() {
     if(!process.env.SKIP_E2E) {
       it('should run e2e tests successfully', function() {
         this.retries(2);
-        return runCmd('gulp test:e2e').should.be.fulfilled();
+        return runCmd('npm run create_primus && gulp test:e2e').should.be.fulfilled();
       });
 
       it.skip('should run e2e tests successfully for production app', function() {
@@ -319,7 +319,7 @@ describe('angular-fullstack:app', function() {
     if(!process.env.SKIP_E2E) {
       it('should run e2e tests successfully', function() {
         this.retries(2);
-        return runCmd('gulp test:e2e').should.be.fulfilled();
+        return runCmd('npm run create_primus && gulp test:e2e').should.be.fulfilled();
       });
 
       it.skip('should run e2e tests successfully for production app', function() {
@@ -392,7 +392,7 @@ describe('angular-fullstack:app', function() {
     if(!process.env.SKIP_E2E) {
       it('should run e2e tests successfully', function() {
         this.retries(2);
-        return runCmd('gulp test:e2e').should.be.fulfilled();
+        return runCmd('npm run create_primus && gulp test:e2e').should.be.fulfilled();
       });
 
       it.skip('should run e2e tests successfully for production app', function() {
diff --git a/templates/app/_package.json b/templates/app/_package.json
index 377a3fbca..2ed140e7c 100644
--- a/templates/app/_package.json
+++ b/templates/app/_package.json
@@ -231,7 +231,8 @@
     "start:mongo": "docker run --rm -d -p 27017:27017 --name mongo mongo",<% } %>
     "start": "node server",
     "start:client": "webpack-dev-server --config webpack.dev.js",
-    "start:server": "node server"
+    "start:server": "node server",
+    "create_primus": "node ./server/config/create_primus.js"
   },
   "private": true
 }
diff --git a/templates/app/server/config/create_primus(ws).js b/templates/app/server/config/create_primus(ws).js
new file mode 100644
index 000000000..a595e99d2
--- /dev/null
+++ b/templates/app/server/config/create_primus(ws).js
@@ -0,0 +1,13 @@
+process.env.NODE_ENV = 'development';
+
+require('babel-register');
+const http = require('http');
+const express = require('express');
+const initWebSocketServer = require('./websockets').default;
+
+initWebSocketServer(http.createServer(express())).then(() => {
+    process.exit(0);
+}).catch(err => {
+    console.error(err);
+    process.exit(1);
+});