diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-04-07 09:34:58 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-04-07 09:34:58 +0400 |
commit | c29d612667a50b4a6924c08526434770b299c757 (patch) | |
tree | 52b5abd7640fecca93cc2f2357f91f996ad320df | |
parent | 450f4492c56f6dc90e8bc9d0fea169f5e480adc6 (diff) |
Do not test Piwik working over HTTPS during tests
-rw-r--r-- | tests/PHPUnit/Fixture.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php index ac0861b871..bca98fe545 100644 --- a/tests/PHPUnit/Fixture.php +++ b/tests/PHPUnit/Fixture.php @@ -335,6 +335,11 @@ class Fixture extends PHPUnit_Framework_Assert if ($testsInPath !== false) { $piwikUrl = substr($piwikUrl, 0, $testsInPath); } + + // in case force_ssl=1, or assume_secure_protocol=1, is set in tests + // we don't want to require Travis CI or devs to setup HTTPS on their local machine + $piwikUrl = str_replace("https://", "http://", $piwikUrl); + return $piwikUrl; } |