fix: bug with the substitution of the base host through env var

lib/view-model.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const Uri = require('urijs');
 const utils = require('../utils');
 
 const NO_STATE = 'NO_STATE';
@@ -103,16 +104,17 @@ module.exports = class ViewModel {
 
     _addTestResult(result, props) {
         const browserId = result.browserId;
-        const browserConfig = this._toolConfig.forBrowser(browserId);
         const suite = result.suite;
+        const browserConfig = this._toolConfig.forBrowser(browserId);
+        const suiteUrl = browserConfig.getAbsoluteUrl(suite.url);
         const metaInfo = {
             url: suite.fullUrl,
             file: suite.file,
             sessionId: result.sessionId || 'unknown session id'
         };
 
         const testResult = _.assign({
-            suiteUrl: browserConfig.getAbsoluteUrl(suite.url),
+            suiteUrl: this._configureSuiteUrl(suiteUrl),
             name: browserId,
             metaInfo: JSON.stringify(metaInfo, null, 4) || 'Meta info is not available'
         }, props);
@@ -137,6 +139,12 @@ module.exports = class ViewModel {
         stateInBrowser.result = testResult;
     }
 
+    _configureSuiteUrl(suiteUrl) {
+        return _.isEmpty(this._pluginConfig.baseHost)
+            ? suiteUrl
+            : Uri(this._pluginConfig.baseHost).resource(suiteUrl).href();
+    }
+
     static hasFails(node) {
         return walk(node, ViewModel.hasFails, node.result && (node.result.error || node.result.fail));
     }

package.json

@@ -39,7 +39,8 @@
     "gemini-configparser": "^0.4.0",
     "handlebars": "^4.0.5",
     "lodash": "^4.17.4",
-    "uglify-js": "^2.7.3"
+    "uglify-js": "^2.7.3",
+    "urijs": "^1.18.12"
   },
   "devDependencies": {
     "chai": "^3.5.0",

test/lib/view-model.js

@@ -175,6 +175,19 @@ describe('ViewModel', () => {
         assert.equal(suiteUrl, 'http://expected.url');
     });
 
+    it('should add base host to suite url from plugin parameter "baseHost"', () => {
+        const model = mkViewModel_(
+            {getAbsoluteUrl: sandbox.stub().withArgs('/some/url').returns('http://some.url/bar')},
+            {baseHost: 'https://some-host.com:1234'}
+        );
+
+        model.addSuccess(stubTest_({suite: {url: '/some/url'}}));
+
+        const suiteUrl = getModelResult_(model).suiteUrl;
+
+        assert.equal(suiteUrl, 'https://some-host.com:1234/bar');
+    });
+
     describe('should add base host to result with', () => {
         it('empty string if plugin paremeter "baseHost" is not specified', () => {
             const model = mkViewModel_();