diff options
author | sgiehl <stefan@piwik.org> | 2014-11-17 22:12:11 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2014-11-17 22:12:31 +0300 |
commit | 9dca69878af18573bcc7e00d7e25880eb3711305 (patch) | |
tree | 291c65dbff10864e1f814393720b745f2b11caaa /tests/PHPUnit | |
parent | f4c685368d18be51117cf2e97d629e26340d7910 (diff) |
refs #6686 - fixed test. reenabled test for travis
Diffstat (limited to 'tests/PHPUnit')
-rwxr-xr-x | tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php | 7 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml | 34 |
2 files changed, 7 insertions, 34 deletions
diff --git a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php index 0e2f56aa4d..bc2d209076 100755 --- a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php +++ b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php @@ -7,6 +7,7 @@ */ namespace Piwik\Tests\System; +use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot; @@ -34,11 +35,7 @@ class OneVisitorNoKeywordSpecifiedTest extends SystemTestCase public function getApiForTesting() { $apiToCall = array('Referrers.getKeywords'); - - // test started failing after bc19503 and I cannot understand why - if(!self::isTravisCI()) { - $apiToCall[] = 'Live.getLastVisitsDetails'; - } + $apiToCall[] = 'Live.getLastVisitsDetails'; return array( array($apiToCall, array('idSite' => self::$fixture->idSite, diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 242012e9c7..dd2dfa26fa 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -23,6 +23,8 @@ + <searches>0</searches> + <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -39,7 +41,7 @@ <customVariables> </customVariables> <deviceType>Inconnu</deviceType> - <browserFamily>unknown</browserFamily> + <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <events>0</events> <provider>Inconnu</provider> @@ -86,19 +88,6 @@ <pluginName>java</pluginName> </row> </pluginsIcons> - <deviceType>Inconnu</deviceType> - <events>0</events> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -159,7 +148,7 @@ <customVariables> </customVariables> <deviceType>Inconnu</deviceType> - <browserFamily>unknown</browserFamily> + <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <events>0</events> <provider>Inconnu</provider> @@ -168,7 +157,7 @@ <referrerType>search</referrerType> <referrerTypeName>Moteurs de recherche</referrerTypeName> <referrerName>Google</referrerName> - <referrerKeyword>Mot clef indéfini</referrerKeyword> + <referrerKeyword>Mot-clé indéfini</referrerKeyword> <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> @@ -206,19 +195,6 @@ <pluginName>java</pluginName> </row> </pluginsIcons> - <deviceType>Inconnu</deviceType> - <events>0</events> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> |