From 21145d45f42418f50c387f5be9de04116318d5d2 Mon Sep 17 00:00:00 2001 From: Benaka Moorthi <benaka.moorthi@gmail.com> Date: Wed, 26 Jun 2013 02:56:29 -0700 Subject: [PATCH] Investigating travis build failure... (33rd commit) --- tests/PHPUnit/Fixtures/InvalidVisits.php | 4 ++-- tests/PHPUnit/Integration/NoVisitTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php index 89e9f84f2f..a424f05c6d 100644 --- a/tests/PHPUnit/Fixtures/InvalidVisits.php +++ b/tests/PHPUnit/Fixtures/InvalidVisits.php @@ -54,7 +54,7 @@ class Test_Piwik_Fixture_InvalidVisits extends Test_Piwik_BaseFixture // test GoogleBot UA visitor $t->setUserAgent('Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'); - //self::checkResponse($t->doTrackPageView('bot visit, please do not record')); + self::checkResponse($t->doTrackPageView('bot visit, please do not record')); // Test IP Exclusion works with or without IP exclusion foreach (array(false, true) as $enable) { @@ -68,7 +68,7 @@ class Test_Piwik_Fixture_InvalidVisits extends Test_Piwik_BaseFixture $t->setUserAgent('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 (.NET CLR 3.5.30729) (excludeduseragentstring)'); $t->setIp('211.1.2.3'); self::checkResponse($t->doTrackPageView('visit from excluded User Agent')); -return; + // test w/ global excluded User Agent $t->setUserAgent('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 (.NET CLR 3.5.30729) (globalexcludeduseragent)'); $t->setIp('211.1.2.3'); diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/Integration/NoVisitTest.php index 6f6fd24339..50cbe20c65 100755 --- a/tests/PHPUnit/Integration/NoVisitTest.php +++ b/tests/PHPUnit/Integration/NoVisitTest.php @@ -29,13 +29,13 @@ class Test_Piwik_Integration_NoVisit extends IntegrationTestCase { // this will output empty XML result sets as no visit was tracked return array( - array('VisitsSummary.get', array('idSite' => self::$fixture->idSite, + array('all', array('idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime)), - /*array('all', array('idSite' => self::$fixture->idSite, + array('all', array('idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => array('day', 'week'), 'setDateLastN' => true, - 'testSuffix' => '_PeriodIsLast')),*/ + 'testSuffix' => '_PeriodIsLast')), ); } -- GitLab