Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2010-11-26 00:15:14 +0300
committermattpiwik <matthieu.aubry@gmail.com>2010-11-26 00:15:14 +0300
commita3e5cb9b4a392f8e7b814025782119690232d0eb (patch)
tree9bab1b6ae7c645f7d0240985e40a1f5a1ad38923 /plugins/Proxy
parent587cf47761e63573702bad278a4be0391717f34e (diff)
Fixing tests
git-svn-id: http://dev.piwik.org/svn/trunk@3361 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Proxy')
-rw-r--r--plugins/Proxy/tests/Proxy.test.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Proxy/tests/Proxy.test.php b/plugins/Proxy/tests/Proxy.test.php
index 44f7986403..fab3b5f6a0 100644
--- a/plugins/Proxy/tests/Proxy.test.php
+++ b/plugins/Proxy/tests/Proxy.test.php
@@ -12,23 +12,23 @@ class Test_Piwik_Proxy extends UnitTestCase
$data = array(
// piwik white list (and used in homepage)
- 'http://piwik.org/' => array(true, true),
+ 'http://piwik.org/' => array(true),
- 'http://piwik.org' => array(true, false),
- 'http://qa.piwik.org/' => array(true, false),
- 'http://forum.piwik.org/' => array(true, false),
- 'http://dev.piwik.org/' => array(true, false),
- 'http://demo.piwik.org/' => array(true, false),
+ 'http://piwik.org' => array(true),
+ 'http://qa.piwik.org/' => array(true),
+ 'http://forum.piwik.org/' => array(true),
+ 'http://dev.piwik.org/' => array(true),
+ 'http://demo.piwik.org/' => array(true),
// not in the piwik white list
- 'http://www.piwik.org/' => array(false, false),
- 'https://piwik.org/' => array(false, false),
+ 'http://www.piwik.org/' => array(false),
+ 'https://piwik.org/' => array(false),
+ 'http://example.org/' => array(false),
);
foreach($data as $url => $expected)
{
$this->assertEqual(Piwik_Proxy_Controller::isPiwikUrl($url), $expected[0], $url);
- $this->assertEqual(Piwik_Proxy_Controller::isAcceptableRemoteUrl($url), $expected[1], $url);
}
}
}