diff options
| author | mattab <matthieu.aubry@gmail.com> | 2015-09-11 02:41:38 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2015-09-11 02:41:38 +0300 |
| commit | bd250985351e3d5d6e8f23ab324fcb64f1933bab (patch) | |
| tree | 41a235141060d0dacc330a98906c78becd22390c /tests/PHPUnit/Framework/Fixture.php | |
| parent | 0c30892efa3d747d4226867cf6ad6ceb6fc51b18 (diff) | |
Append the request_uri but avoid double slashes (for integration tests to pass)
Diffstat (limited to 'tests/PHPUnit/Framework/Fixture.php')
| -rw-r--r-- | tests/PHPUnit/Framework/Fixture.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index e2e1890fc9..a048dad516 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -488,7 +488,9 @@ class Fixture extends \PHPUnit_Framework_Assert $piwikUrl = str_replace("https://", "http://", $piwikUrl); // append REQUEST_URI (eg. when Piwik runs at http://localhost/piwik/) - $piwikUrl .= $piwikUri; + if($piwikUri != '/') { + $piwikUrl .= $piwikUri; + } return $piwikUrl; } |