Update tests to support single port depolyment and custom server

gulpfile.js

@@ -23,10 +23,12 @@ var gulp = require('gulp')
   , header = require('gulp-header')
   , git = require('git-rev-sync')
   , pkg = require('./package.json')
+  , yargs = require('yargs')
   ;
 
 var express = require('express')
   , server
+  , argv = yargs.argv
   , app = express();
 
 app.use(express.static(__dirname));
@@ -149,7 +151,7 @@ gulp.task('serve', ['build'], function () {
 });
 
 gulp.task('test', ['build', 'serve'], function () {
-  return gulp.src('tests/**/test-*.js', {read: false})
+  return gulp.src(argv['test-files'] || 'tests/**/test-*.js', {read: false})
     .pipe(mocha({
       reporter: 'dot'
     }))

package.json

@@ -8,7 +8,8 @@
   },
   "repository": "stackstorm/st2web",
   "dependencies": {
-    "st2client": "^0.4.3"
+    "st2client": "^0.4.3",
+    "urijs": "^1.17.0"
   },
   "devDependencies": {
     "chai": "^3.3.0",
@@ -37,6 +38,7 @@
     "main-bower-files": "^2.4.0",
     "request": "^2.49.0",
     "yamljs": "^0.2.4",
+    "yargs": "^3.32.0",
     "zombie": "https://github.com/enykeev/zombie/releases/download/enykeev-1/zombie-4.1.0.tgz"
   }
 }

tests/test-actions.js

@@ -31,7 +31,7 @@ describe('User visits actions page', function () {
 
     before(function () {
       resource = browser.resources.filter(function (e) {
-        return new RegExp('^http://172.168.60.10:9101/v1/actions$').test(e.url);
+        return new RegExp('^https://example.com/api/v1/actions$').test(e.url);
       });
     });
 
@@ -58,7 +58,7 @@ describe('User visits actions page', function () {
 
     before(function () {
       resource = browser.resources.filter(function (e) {
-        return new RegExp('^http://172.168.60.10:9101/v1/actions/views/overview/[\\w.-]+$').test(e.url);
+        return new RegExp('^https://example.com/api/v1/actions/views/overview/[\\w.-]+$').test(e.url);
       });
     });
 

tests/test-history.js

@@ -31,7 +31,7 @@ describe('User visits history page', function () {
 
     before(function () {
       resource = browser.resources.filter(function (e) {
-        return ~e.url.indexOf('http://172.168.60.10:9101/v1/executions?'); //jshint ignore:line
+        return ~e.url.indexOf('https://example.com/api/v1/executions?'); //jshint ignore:line
       });
     });
 
@@ -59,7 +59,7 @@ describe('User visits history page', function () {
 
     before(function () {
       resource = browser.resources.filter(function (e) {
-        return new RegExp('^http://172.168.60.10:9101/v1/executions/\\w+$').test(e.url);
+        return new RegExp('^https://example.com/api/v1/executions/\\w+$').test(e.url);
       });
     });
 
@@ -85,7 +85,7 @@ describe('User visits history page', function () {
       browser.assert.text(util.name('header_description'), execution.action.description, 'Wrong description in header');
 
       browser.assert.text(util.name('status'), util.capitalize(execution.status), 'Wrong status');
-      browser.assert.attribute(util.name('execution_id'), 'value', execution.id, 'Wrong execution id');
+      browser.assert.text(util.name('execution_id'), execution.id, 'Wrong execution id');
       browser.assert.text(util.name('start_timestamp'), util.formatUTC(execution.start_timestamp), 'Wrong start time');
       browser.assert.text(util.name('end_timestamp'), util.formatUTC(execution.end_timestamp), 'Wrong end time');
 
@@ -122,7 +122,7 @@ describe('User visits history page', function () {
           browser.assert.elements(util.name('rerun_popup'), 0, 'Rerun popup is in DOM when it should not be');
 
           var resource = browser.resources.filter(function (e) {
-            return e.request.method === 'POST' && new RegExp('^http://172.168.60.10:9101/v1/executions/\\w+/re_run$').test(e.url);
+            return e.request.method === 'POST' && new RegExp('^https://example.com/api/v1/executions/\\w+/re_run$').test(e.url);
           });
 
           expect(resource).to.have.length(1, 'Rerun should make a single request');

tests/test-rules.js

@@ -31,7 +31,7 @@ describe('User visits rules page', function () {
 
     before(function () {
       resource = browser.resources.filter(function (e) {
-        return new RegExp('^http://172.168.60.10:9101/v1/rules/views$').test(e.url);
+        return new RegExp('^https://example.com/api/v1/rules/views$').test(e.url);
       });
     });
 
@@ -58,7 +58,7 @@ describe('User visits rules page', function () {
 
     before(function () {
       resource = browser.resources.filter(function (e) {
-        var match = e.url.match(new RegExp('^http://172.168.60.10:9101/v1/rules/([\\w.-]+)$'));
+        var match = e.url.match(new RegExp('^https://example.com/api/v1/rules/([\\w.-]+)$'));
         return match && match[1] && match[1] !== 'views';
       });
     });
@@ -83,7 +83,7 @@ describe('User visits rules page', function () {
       browser.assert.element(util.name('delete_button'), 'Delete button is missing');
 
       browser.assert.text(util.name('status'), rule.enabled ? 'Enabled' : 'Disabled', 'Wrong status');
-      browser.assert.text(util.name('header_name'), rule.name, 'Wrong name in header');
+      browser.assert.text(util.name('header_name'), rule.ref, 'Wrong ref in header');
       browser.assert.text(util.name('header_description'), rule.description, 'Wrong description in header');
       browser.assert.text(util.name('header_if'), 'If ' + rule.trigger.ref, 'Wrong if in header');
       browser.assert.text(util.name('header_then'), 'Then ' + rule.action.ref, 'Wrong then in header');

tests/util.js

@@ -1,12 +1,36 @@
 /* jshint node:true */
 'use strict';
+var URI = require('urijs');
+
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
 module.exports = function (browser) {
+  browser.pipeline.addHandler(function(browser, request) {
+    var url = new URI(request.url);
+
+    if (url.directory().match(/^\/auth/) || url.directory().match(/^\/api/)) {
+      request.url = url.host(process.env.ST2_HOST).toString();
+    }
+
+    return null;
+  });
+
+  browser.pipeline.addHandler(function(browser, request, response) {
+    var url = new URI(response.url);
+
+    if (url.host() === process.env.ST2_HOST) {
+      response._url = url.host('example.com').toString();
+      request.url = response.url;
+    }
+
+    return response;
+  });
+
   return {
     login: function () {
       return browser
-        .fill('username', 'testu')
-        .fill('password', 'testp')
+        .fill('username', process.env.ST2_USERNAME)
+        .fill('password', process.env.ST2_PASSWORD)
         .pressButton('Connect');
     },
     capitalize: function (str) {