Merge pull request #736 from gemini-testing/fix/metainfo-url

Method "fullUrl" should resolve url in runtime
gemini-testing · Feb 15, 2017 · 8c24228 · 8c24228
2 parents 50c738d + e796dce
commit 8c24228
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/runner/browser-runner/index.js b/lib/runner/browser-runner/index.js
@@ -30,7 +30,9 @@ module.exports = class BrowserRunner extends Runner {
             .filter((suite) => _.includes(suite.browsers, this._browserId))
             .map((suite) => {
                 if (suite.hasOwnProperty('url')) {
-                    suite.fullUrl = this._mkFullUrl(suite.url);
+                    Object.defineProperty(suite, 'fullUrl', {
+                        get: () => this._mkFullUrl(suite.url)
+                    });
                 }
 
                 return this._runSuite(suite, stateProcessor);

diff --git a/test/unit/runner/browser-runner/index.js b/test/unit/runner/browser-runner/index.js
@@ -144,6 +144,14 @@ describe('runner/BrowserRunner', () => {
                     .then(() => suiteRunnerFabric.create.args[0][0]); // resolve with modified suite
             };
 
+            it('should resolve url in runtime', () => {
+                return run_({rootUrl: 'http://localhost/', suiteUrl: 'testUrl'})
+                    .then((suite) => {
+                        suite.url += '/?query=value';
+                        assert.equal(suite.fullUrl, '/testUrl/?query=value');
+                    });
+            });
+
             it('should not modify suite without "url" as own property', () => {
                 return run_({rootUrl: 'http://localhost/foo/bar/'})
                     .then((suite) => assert.isUndefined(suite.fullUrl));