diff options
| author | Benaka <diosmosis@users.noreply.github.com> | 2015-11-02 21:04:15 +0300 |
|---|---|---|
| committer | Benaka <diosmosis@users.noreply.github.com> | 2015-11-02 21:04:15 +0300 |
| commit | 6bdc5c3a2c61c0931f8180939e8cd2308439f555 (patch) | |
| tree | 3a69fc400f8023db707bc20e89e0ada3659dbc44 /tests | |
| parent | 5dd57c8898cb3f1865e5542610e4e26a07251085 (diff) | |
| parent | 7b2763d4c8aa4ee2e55caf40b23c12d581a5e0ac (diff) | |
Merge pull request #9151 from piwik/travis_legacy
Fixes #9146, use legacy infrastructure on travis
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/screenshot-testing/support/page-renderer.js | 2 | ||||
| m--------- | tests/travis | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js index 60d9c1e5cc..6c23fd0243 100644 --- a/tests/lib/screenshot-testing/support/page-renderer.js +++ b/tests/lib/screenshot-testing/support/page-renderer.js @@ -680,7 +680,7 @@ PageRenderer.prototype._setupWebpageEvents = function () { // replaces the requested URL to the piwik URL w/ a port, if it does not have one. This allows us to run UI // tests when Piwik is on a port, w/o having to have different UI screenshots. (This is one half of the // solution, the other half is in config/environment/ui-test.php, where we remove all ports from Piwik URLs.) - if (piwikPort) { + if (piwikPort && piwikPort != 0) { linkObject.setAttribute('href', url); if (linkObject.hostname == piwikHost && (!linkObject.port || linkObject.port == 0 || linkObject.port == 80)) { diff --git a/tests/travis b/tests/travis -Subproject 44793a84ba819230ad05a2a909e114ed63a2ead +Subproject 5c1208d725916d21e47527c8d7281af52a5bb5f |