commit f4f695500f08272564fad9eb35774d926344e39d
author Matteo Scandolo <matteo.scandolo@gmail.com> Thu Aug 24 17:26:25 2017 -0700
committer Matteo Scandolo <teo@opennetworking.org> Tue Mar 13 15:12:50 2018 -0700
tree 2e51278b7a239b7d127021cfbe69deff2ff0f727
parent 865b11c6804a8ede882fa87d506a4c18d58e6e0c

[CORD-2338] Single command to run E2E tests

Change-Id: Id8db22b2b496ca16d20d2c4d0739d9b9042540db

conf/protractor.conf.jenkins.js

diff --git a/conf/protractor.conf.jenkins.js b/conf/protractor.conf.jenkins.js
index a0dd938..b3ea2cc 100644
--- a/conf/protractor.conf.jenkins.js
+++ b/conf/protractor.conf.jenkins.js
@@ -15,16 +15,29 @@
  * limitations under the License.
  */
 
+const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
 
 exports.config = {
-  seleniumServerJar: '/home/teone/selenium/selenium-server-standalone-2.44.0.jar',
+  seleniumAddress: 'http://localhost:4444/wd/hub',
   capabilities: {
-    'browserName': 'firefox'
+    browserName: 'firefox',
+    'moz:firefoxOptions': {
+       args: [ "--headless" ]
+     }
   },
   specs: [
     '../e2e/**/*.spec.js'
   ],
+  onPrepare: function () {
+    jasmine.getEnv().addReporter(new SpecReporter({
+      spec: {
+        displayStacktrace: true
+      }
+    }));
+  },
   jasmineNodeOpts: {
-    showColors: true
+    print: function() {},
+    showColors: true,
+    allScriptsTimeout: 40000
   }
 };
\ No newline at end of file

conf/protractor.conf.js

diff --git a/conf/protractor.conf.js b/conf/protractor.conf.js
index b3e9fac..feaf440 100644
--- a/conf/protractor.conf.js
+++ b/conf/protractor.conf.js
@@ -26,6 +26,9 @@
     keyboard: '../e2e/keyboard-shortcuts/*.spec.js',
     crud: '../e2e/crud/*.spec.js'
   },
+  capabilities: {
+    'browserName': 'chrome'
+  },
   onPrepare: function () {
     jasmine.getEnv().addReporter(new SpecReporter({
       spec: {
@@ -36,7 +39,6 @@
   jasmineNodeOpts: {
     print: function() {},
     showColors: true, // Use colors in the command line report.
-    defaultTimeoutInterval: (parseInt(process.env.TIMEOUT, 10) + 1000) || 30 * 1000
   },
   allScriptsTimeout: parseInt(process.env.TIMEOUT, 10) || 10 * 1000
 };
\ No newline at end of file

conf/proxy.js

diff --git a/conf/proxy.js b/conf/proxy.js
index 8eb4fee..ad94635 100644
--- a/conf/proxy.js
+++ b/conf/proxy.js
@@ -18,9 +18,7 @@
 
 const httpProxy = require('http-proxy');
 
-const target = process.env.PROXY || '127.0.0.1:8080';
-
-console.info(`Proxying request to: ${target}`);
+const target = process.env.PROXY || '127.0.0.1:9101';
 
 const proxy = httpProxy.createProxyServer({
   target: `http://${target}`,