From 5d46f802f0485c504c3923aa625032ca998048cf Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Wed, 29 Mar 2017 10:09:18 +0200 Subject: Make it possible to disable flattening for an report (#11529) * use report property to enable/disable flattener * update tests * Update changelog [ci skip] * minor renamings --- ...ng_flattened__Referrers.getReferrerType_day.xml | 62 ++++------------------ .../UIIntegrationTest_metric_tooltip.png | 4 +- 2 files changed, 12 insertions(+), 54 deletions(-) (limited to 'tests') diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml index 2f781c0adb..e8636937d0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml @@ -14,68 +14,26 @@ - 7 - 7 - 7 - 0 - 1 - 0 - 7 - 0 - - - - 3 - 4 - 4 - 0 - 1 - 0 - 4 - 0 - - - - 3 - 3 - 3 + 12 + 12 + 12 0 1 0 - 3 - 0 - - - - 2 - 2 - 2 - 0 - 1 - 0 - 2 + 12 0 + referrerType==search - 2 - 2 - 2 - 0 - 1 - 0 - 2 - 0 - - - - 2 - 2 - 2 + 7 + 8 + 8 0 1 0 - 2 + 8 0 + referrerType==website \ No newline at end of file diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png index ace02fe4d0..0bf02f7209 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c133c0a47fe8139277d12e0fd82a5145d84a22d6bfeeff18b4cde7a0e8316b04 -size 168821 +oid sha256:d8ff715f995e7e109653c1c2a774d1ffd0219c5db50c8ac797fac07383c756d6 +size 168384 -- cgit v1.2.3 From d578a737916f64e777c37ce8a427591c5c9e2414 Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Wed, 29 Mar 2017 19:47:37 +0200 Subject: Replace archives if they already exists instead of ignoring them (#11476) * replace archives if they already exists instead of ignoring them * adds a simple test to prove archives are replaced now * improve test --- tests/PHPUnit/Integration/ArchiveTest.php | 64 +++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'tests') diff --git a/tests/PHPUnit/Integration/ArchiveTest.php b/tests/PHPUnit/Integration/ArchiveTest.php index 906cfe40c9..df8ef4021c 100644 --- a/tests/PHPUnit/Integration/ArchiveTest.php +++ b/tests/PHPUnit/Integration/ArchiveTest.php @@ -7,16 +7,21 @@ */ namespace Piwik\Tests\Integration; +use Piwik\API\Proxy; use Piwik\Archive as PiwikArchive; +use Piwik\ArchiveProcessor; use Piwik\ArchiveProcessor\Parameters; use Piwik\ArchiveProcessor\Rules; use Piwik\Common; use Piwik\Config; +use Piwik\DataAccess\ArchiveSelector; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\DataAccess\ArchiveWriter; +use Piwik\DataAccess\LogAggregator; use Piwik\Date; use Piwik\Db; use Piwik\Piwik; +use Piwik\Plugins\UserLanguage; use Piwik\Segment; use Piwik\Site; use Piwik\Tests\Fixtures\OneVisitorTwoVisits; @@ -229,6 +234,65 @@ class ArchiveTest extends IntegrationTestCase ); } + public function testExistingArchivesAreReplaced() + { + $date = self::$fixture->dateTime; + $period = PeriodFactory::makePeriodFromQueryParams('UTC', 'day', $date); + + // request an report to trigger archiving + $userLanguageReport = Proxy::getInstance()->call('\\Piwik\\Plugins\\UserLanguage\\API', 'getLanguage', array( + 'idSite' => 1, + 'period' => 'day', + 'date' => $date + )); + + $this->assertEquals(1, $userLanguageReport->getRowsCount()); + $this->assertEquals('UserLanguage_LanguageCode fr', $userLanguageReport->getFirstRow()->getColumn('label')); + $this->assertEquals('UserLanguage_LanguageCode fr', $userLanguageReport->getLastRow()->getColumn('label')); + + $parameters = new Parameters(new Site(1), $period, new Segment('', '')); + $parameters->setRequestedPlugin('UserLanguage'); + + $result = ArchiveSelector::getArchiveIdAndVisits($parameters, $period->getDateStart()->getDateStartUTC()); + $idArchive = $result ? array_shift($result) : null; + + if (empty($idArchive)) { + $this->fail('Archive should be available'); + } + + // track a new visits now + $fixture = self::$fixture; + $t = $fixture::getTracker(1, $date, $defaultInit = true); + $t->setForceVisitDateTime(Date::factory($date)->addHour(1)->getDatetime()); + $t->setUrl('http://example.org/index.htm'); + $t->setBrowserLanguage('pt-br'); + $fixture::checkResponse($t->doTrackPageView('my site')); + + $archiveWriter = new ArchiveWriter($parameters, !!$idArchive); + $archiveWriter->idArchive = $idArchive; + + $archiveProcessor = new ArchiveProcessor($parameters, $archiveWriter, + new LogAggregator($parameters)); + + $archiveProcessor->setNumberOfVisits(1, 1); + + // directly trigger specific archiver for existing archive + $archiver = new UserLanguage\Archiver($archiveProcessor); + $archiver->aggregateDayReport(); + + // report should be updated + $userLanguageReport = Proxy::getInstance()->call('\\Piwik\\Plugins\\UserLanguage\\API', 'getLanguage', array( + 'idSite' => 1, + 'period' => 'day', + 'date' => $date + )); + + $this->assertEquals(2, $userLanguageReport->getRowsCount()); + $this->assertEquals('UserLanguage_LanguageCode fr', $userLanguageReport->getFirstRow()->getColumn('label')); + $this->assertEquals('UserLanguage_LanguageCode pt', $userLanguageReport->getLastRow()->getColumn('label')); + } + + private function createManyDifferentArchiveBlobs() { $recordName1 = 'Actions_Actions'; -- cgit v1.2.3 From a21b868d63b1a210016c9a43a3a470b5e88f6c64 Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Wed, 29 Mar 2017 22:19:15 +0200 Subject: New flag icons (#11553) * updated flag icons * remove lines completly * Visitors in Real-time * added ti flag * fix merge * readd logoHeight * remove flags from plugins/UserCountry/images/ * change flag directory * (hopefully) fix all tests * UserCountry system tests * Fix tests refs https://github.com/piwik/piwik/pull/11553 * Fixed CustomDimensions tests * remove unused flags * remove flag of united nations * System tests with new path * light border around flags in goals and live view * Fix BC system test * border around flag in visitor profile * Border around country flags in reports * border around flag icons in HTML reports * simpler css * System tests * UI tests show new flags + borders around them --- .../System/BackwardsCompatibility1XTest.php | 3 + ...nt_noOptions__Live.getLastVisitsDetails_day.xml | 54 ++-- ...t_noOptions__Live.getLastVisitsDetails_year.xml | 60 ++-- ...estAPITest__Live.getLastVisitsDetails_range.xml | 70 ++--- ...atibility1XTest__UserCountry.getCountry_day.xml | 30 ++ ...CustomEvents__Live.getLastVisitsDetails_day.xml | 60 ++-- ...stomEvents__Live.getLastVisitsDetails_month.xml | 60 ++-- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 312 ++++++++++----------- .../test_ImportLogs__UserCountry.getCity_month.xml | 10 +- ...st_ImportLogs__UserCountry.getCountry_month.xml | 35 +-- ...est_ImportLogs__UserCountry.getRegion_month.xml | 10 +- ...ixedSiteId__Live.getLastVisitsDetails_range.xml | 90 +++--- ...AndLimit_1__Live.getLastVisitsDetails_month.xml | 18 +- ...AndLimit_2__Live.getLastVisitsDetails_month.xml | 18 +- ...ls_sortAsc__Live.getLastVisitsDetails_month.xml | 14 +- ...IdVisitAsc__Live.getLastVisitsDetails_month.xml | 14 +- ...tByIdVisit__Live.getLastVisitsDetails_month.xml | 42 +-- ...VisitCount__Live.getLastVisitsDetails_month.xml | 14 +- ...s_sortDesc__Live.getLastVisitsDetails_month.xml | 42 +-- ...ebsiteTest__Live.getLastVisitsDetails_month.xml | 60 ++-- ...rsOneWebsiteTest__UserCountry.getCity_month.xml | 24 +- ...neWebsiteTest__UserCountry.getCountry_month.xml | 50 ++-- ...OneWebsiteTest__UserCountry.getRegion_month.xml | 20 +- ...excludelowpop__UserCountry.getCountry_month.xml | 10 +- ...est_segment_city__UserCountry.getCity_month.xml | 2 +- ..._segment_city__UserCountry.getCountry_month.xml | 5 +- ...t_segment_city__UserCountry.getRegion_month.xml | 2 +- ...ent_continent__UserCountry.getCountry_month.xml | 25 +- ...segment_lat_long__UserCountry.getCity_month.xml | 2 +- ...ment_lat_long__UserCountry.getCountry_month.xml | 5 +- ...gment_lat_long__UserCountry.getRegion_month.xml | 2 +- ...t_segment_region__UserCountry.getCity_month.xml | 4 +- ...egment_region__UserCountry.getCountry_month.xml | 5 +- ...segment_region__UserCountry.getRegion_month.xml | 2 +- ...neVisitorTwoVisits__UserCountry.getCity_day.xml | 2 +- ...isitorTwoVisits__UserCountry.getCountry_day.xml | 2 +- ...VisitorTwoVisits__UserCountry.getRegion_day.xml | 2 +- ...ookieSupport__Live.getLastVisitsDetails_day.xml | 12 +- ..._withCookieSupport__UserCountry.getCity_day.xml | 2 +- ...thCookieSupport__UserCountry.getCountry_day.xml | 5 +- ...ithCookieSupport__UserCountry.getRegion_day.xml | 2 +- ...ordSpecified__Live.getLastVisitsDetails_day.xml | 12 +- ...fThreeDays__Live.getLastVisitsDetails_month.xml | 18 +- ...imezonesTest__Live.getLastVisitsDetails_day.xml | 6 +- ...duledReports.generateReport_month.original.html | 60 ++-- ...duledReports.generateReport_month.original.html | 54 ++-- ...eduledReports.generateReport_month.original.pdf | Bin 552121 -> 552243 bytes ...tReportMetadata__API.getProcessedReport_day.xml | 5 +- ..._showRawMetrics__API.getProcessedReport_day.xml | 5 +- ...st_csvExport__Live.getLastVisitsDetails_day.csv | Bin 8472 -> 8478 bytes ...tatusOrdered__Live.getLastVisitsDetails_day.xml | 4 +- ...eOrderWithItems__API.getProcessedReport_day.xml | 10 +- ...derWithItems__Live.getLastVisitsDetails_day.xml | 6 +- ...erceOrderWithItems__UserCountry.getCity_day.xml | 2 +- ...eOrderWithItems__UserCountry.getCountry_day.xml | 10 +- ...ceOrderWithItems__UserCountry.getRegion_day.xml | 2 +- ...eduledReports.generateReport_week.original.html | 46 +-- ...eduledReports.generateReport_week.original.html | 40 +-- ...heduledReports.generateReport_week.original.pdf | Bin 569258 -> 569333 bytes ...ays_DateRange__UserCountry.getCountry_range.xml | 5 +- ...aAndNormalAPI__API.getProcessedReport_range.xml | 5 +- ...tN_MetadataAndNormalAPI__Live.getLastVisits.xml | 18 +- ...dNormalAPI__Live.getLastVisitsDetails_range.xml | 18 +- ...etadataAndNormalAPI__Live.getVisitorProfile.xml | 14 +- ...I_pagesegment__API.getProcessedReport_range.xml | 5 +- ...ndNormalAPI_pagesegment__Live.getLastVisits.xml | 18 +- ...agesegment__Live.getLastVisitsDetails_range.xml | 18 +- ...rmalAPI_pagesegment__Live.getVisitorProfile.xml | 14 +- ...est_reportLimiting__UserCountry.getCity_day.xml | 6 +- ...t_reportLimiting__UserCountry.getRegion_day.xml | 6 +- ...Limiting_flattened__UserCountry.getCity_day.xml | 6 +- ...miting_flattened__UserCountry.getRegion_day.xml | 6 +- ...iting_rankingQuery__UserCountry.getCity_day.xml | 6 +- ...ing_rankingQuery__UserCountry.getRegion_day.xml | 6 +- .../ActionsDataTable_segmented_visitor_log.png | 4 +- .../UIIntegrationTest_dashboard2.png | 4 +- .../UIIntegrationTest_dashboard3.png | 4 +- .../UIIntegrationTest_ecommerce_log.png | 4 +- .../UIIntegrationTest_goals_individual_goal.png | 4 +- ...tegrationTest_goals_individual_goal_updated.png | 4 +- .../UIIntegrationTest_segmented_visitorlog.png | 4 +- .../UIIntegrationTest_visitor_profile_popup.png | 4 +- ...IntegrationTest_visitors_locations_provider.png | 4 +- .../UIIntegrationTest_visitors_realtime_map.png | 4 +- ...onTest_visitors_with_site_search_visitorlog.png | 4 +- .../UIIntegrationTest_widgetize_ecommercelog.png | 4 +- 86 files changed, 838 insertions(+), 842 deletions(-) create mode 100644 tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml (limited to 'tests') diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 443112a97f..73bdb32cdc 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -119,6 +119,9 @@ class BackwardsCompatibility1XTest extends SystemTestCase 'Actions.getPageUrls', 'Actions.getDownloads', 'Actions.getDownload', + + // new flag dimensions + 'UserCountry.getCountry', ); $apiNotToCall = array( diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index 1767b3b86f..1b1925d1ec 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -89,7 +89,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -107,10 +107,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -203,7 +203,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -221,10 +221,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -317,7 +317,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -335,10 +335,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -431,7 +431,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -449,10 +449,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -545,7 +545,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -563,10 +563,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -659,7 +659,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -677,10 +677,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -773,7 +773,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -791,10 +791,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -887,7 +887,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -905,10 +905,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1001,7 +1001,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -1019,10 +1019,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 9d70523384..20a0ff9335 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -280,7 +280,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -298,10 +298,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -402,7 +402,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -433,10 +433,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -529,7 +529,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -551,10 +551,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -647,7 +647,7 @@ asi South Korea kr - plugins/UserCountry/images/flags/kr.png + plugins/Morpheus/icons/dist/flags/kr.png Seoul-t'ukpyolsi 11 Seoul @@ -669,10 +669,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -784,7 +784,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -806,10 +806,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -929,7 +929,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -951,10 +951,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1047,7 +1047,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -1069,10 +1069,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1165,7 +1165,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -1187,10 +1187,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1272,7 +1272,7 @@ oce Australia au - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png @@ -1294,10 +1294,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1390,7 +1390,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -1412,10 +1412,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 2569b8da4d..acfde7e3fc 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -83,7 +83,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA not a city @@ -268,7 +268,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -399,7 +399,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -573,7 +573,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -704,7 +704,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -897,7 +897,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -1028,7 +1028,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -1202,7 +1202,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Stratford-upon-Avon @@ -1333,7 +1333,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Stratford-upon-Avon @@ -1526,7 +1526,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Kent G5 Stratford-upon-Avon @@ -1657,7 +1657,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Kent G5 Stratford-upon-Avon @@ -1831,7 +1831,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png London, City of H9 London @@ -2005,7 +2005,7 @@ asi Tibet ti - plugins/UserCountry/images/flags/ti.png + plugins/Morpheus/icons/dist/flags/ti.png Unknown 1 Lhasa @@ -2128,7 +2128,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png London, City of H9 London @@ -2259,7 +2259,7 @@ asi Tibet ti - plugins/UserCountry/images/flags/ti.png + plugins/Morpheus/icons/dist/flags/ti.png Unknown 1 Lhasa @@ -2452,7 +2452,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -2645,7 +2645,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -2768,7 +2768,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -2899,7 +2899,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -3073,7 +3073,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Nuneaton and Bedworth @@ -3247,7 +3247,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -3421,7 +3421,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -3587,7 +3587,7 @@ asi Indonesia id - plugins/UserCountry/images/flags/id.png + plugins/Morpheus/icons/dist/flags/id.png @@ -3718,7 +3718,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Nuneaton and Bedworth @@ -3849,7 +3849,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -3980,7 +3980,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -4111,7 +4111,7 @@ asi Indonesia id - plugins/UserCountry/images/flags/id.png + plugins/Morpheus/icons/dist/flags/id.png @@ -4304,7 +4304,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -4497,7 +4497,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png Franche-Comte A6 Besançon @@ -4690,7 +4690,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -4875,7 +4875,7 @@ eur Italy it - plugins/UserCountry/images/flags/it.png + plugins/Morpheus/icons/dist/flags/it.png @@ -5006,7 +5006,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -5137,7 +5137,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png Franche-Comte A6 Besançon @@ -5268,7 +5268,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -5399,7 +5399,7 @@ eur Italy it - plugins/UserCountry/images/flags/it.png + plugins/Morpheus/icons/dist/flags/it.png diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml new file mode 100644 index 0000000000..9a80fd221e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml @@ -0,0 +1,30 @@ + + + + + 1 + 2 + 8 + 7 + 1621 + 1 + + + 1 + 1 + 42 + + + 1 + 1 + 1 + + + 2 + 43 + fr + plugins/Morpheus/icons/dist/flags/fr.png + countryCode==fr + 16 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index f1426e40f6..f6e2c74e73 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -73,7 +73,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -106,10 +106,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -186,7 +186,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -219,10 +219,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -377,7 +377,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -410,10 +410,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -490,7 +490,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -523,10 +523,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -894,7 +894,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -927,10 +927,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1007,7 +1007,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1036,10 +1036,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1116,7 +1116,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1145,10 +1145,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1303,7 +1303,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1332,10 +1332,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1412,7 +1412,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1441,10 +1441,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1761,7 +1761,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1790,10 +1790,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 3327e3002e..6256dca24b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -73,7 +73,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -102,10 +102,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -182,7 +182,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -211,10 +211,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -369,7 +369,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -398,10 +398,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -478,7 +478,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -507,10 +507,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -827,7 +827,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -856,10 +856,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -936,7 +936,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -969,10 +969,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1049,7 +1049,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1082,10 +1082,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1240,7 +1240,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1273,10 +1273,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1353,7 +1353,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1386,10 +1386,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1757,7 +1757,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -1790,10 +1790,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index a41bee8bd7..4b2ba500d1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -91,7 +91,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png North Carolina NC Raleigh @@ -128,10 +128,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -243,7 +243,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA Lake Forest @@ -267,10 +267,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -365,7 +365,7 @@ eur Germany de - plugins/UserCountry/images/flags/de.png + plugins/Morpheus/icons/dist/flags/de.png @@ -414,10 +414,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -529,7 +529,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -570,10 +570,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -655,7 +655,7 @@ eur Belgium be - plugins/UserCountry/images/flags/be.png + plugins/Morpheus/icons/dist/flags/be.png Limburg 05 Maaseik @@ -696,10 +696,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -794,7 +794,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA San Francisco @@ -843,10 +843,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -939,7 +939,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png Kanagawa 19 Nihon'odori @@ -976,10 +976,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1074,7 +1074,7 @@ eur Germany de - plugins/UserCountry/images/flags/de.png + plugins/Morpheus/icons/dist/flags/de.png Nordrhein-Westfalen 07 Weilerswist @@ -1103,10 +1103,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1201,7 +1201,7 @@ eur Germany de - plugins/UserCountry/images/flags/de.png + plugins/Morpheus/icons/dist/flags/de.png Rheinland-Pfalz 08 Mainz @@ -1250,10 +1250,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1388,7 +1388,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Moscow City 48 Moscow @@ -1421,10 +1421,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1519,7 +1519,7 @@ eur Turkey tr - plugins/UserCountry/images/flags/tr.png + plugins/Morpheus/icons/dist/flags/tr.png Rize 53 Esentepe @@ -1560,10 +1560,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1658,7 +1658,7 @@ eur Belgium be - plugins/UserCountry/images/flags/be.png + plugins/Morpheus/icons/dist/flags/be.png Limburg 05 Maaseik @@ -1699,10 +1699,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1986,7 +1986,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -2006,10 +2006,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -2104,7 +2104,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -2124,10 +2124,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -2239,7 +2239,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -2259,10 +2259,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -2365,7 +2365,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -2389,10 +2389,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -2535,7 +2535,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -2559,10 +2559,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -2657,7 +2657,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -2677,10 +2677,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -2804,7 +2804,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -2824,10 +2824,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -2928,7 +2928,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -2952,10 +2952,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3056,7 +3056,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -3089,10 +3089,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3185,7 +3185,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -3234,10 +3234,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3332,7 +3332,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png Nunavut NU Igloolik @@ -3352,10 +3352,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3450,7 +3450,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png New Jersey NJ Mount Laurel @@ -3470,10 +3470,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3557,7 +3557,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -3577,10 +3577,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3663,7 +3663,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -3683,10 +3683,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3779,7 +3779,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -3803,10 +3803,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -3899,7 +3899,7 @@ asi South Korea kr - plugins/UserCountry/images/flags/kr.png + plugins/Morpheus/icons/dist/flags/kr.png Seoul-t'ukpyolsi 11 Seoul @@ -3923,10 +3923,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4038,7 +4038,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -4062,10 +4062,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4185,7 +4185,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -4209,10 +4209,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4305,7 +4305,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -4329,10 +4329,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4425,7 +4425,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -4449,10 +4449,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4534,7 +4534,7 @@ oce Australia au - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png @@ -4558,10 +4558,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4654,7 +4654,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -4678,10 +4678,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4774,7 +4774,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -4798,10 +4798,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -4894,7 +4894,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -4914,10 +4914,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5010,7 +5010,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -5030,10 +5030,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5126,7 +5126,7 @@ ams Brazil br - plugins/UserCountry/images/flags/br.png + plugins/Morpheus/icons/dist/flags/br.png @@ -5146,10 +5146,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5242,7 +5242,7 @@ ams Brazil br - plugins/UserCountry/images/flags/br.png + plugins/Morpheus/icons/dist/flags/br.png @@ -5262,10 +5262,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5358,7 +5358,7 @@ ams Brazil br - plugins/UserCountry/images/flags/br.png + plugins/Morpheus/icons/dist/flags/br.png @@ -5378,10 +5378,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5474,7 +5474,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -5494,10 +5494,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5590,7 +5590,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -5610,10 +5610,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5706,7 +5706,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -5726,10 +5726,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5822,7 +5822,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -5842,10 +5842,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -5938,7 +5938,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -5958,10 +5958,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -6054,7 +6054,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -6074,10 +6074,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -6170,7 +6170,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -6190,10 +6190,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -6286,7 +6286,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png Virginia VA Ashburn @@ -6306,10 +6306,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -6402,7 +6402,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -6422,10 +6422,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -6518,7 +6518,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -6538,10 +6538,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -6634,7 +6634,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -6654,10 +6654,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -6750,7 +6750,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png @@ -6770,10 +6770,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index 4f7962f12b..e7b230a210 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -25,7 +25,7 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -53,7 +53,7 @@ us United States Virginia - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -81,7 +81,7 @@ ca Canada Nunavut - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png @@ -109,7 +109,7 @@ us United States New Jersey - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -137,6 +137,6 @@ kr South Korea Seoul-t'ukpyolsi - plugins/UserCountry/images/flags/kr.png + plugins/Morpheus/icons/dist/flags/kr.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 70da83f4e9..63c3f98c5a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -19,10 +19,9 @@ 11 0 jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png countryCode==jp - 16 - 11 + 16 @@ -43,10 +42,9 @@ 9 2 us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png countryCode==us - 16 - 11 + 16 @@ -68,10 +66,9 @@ 1 0 xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png countryCode==xx - 16 - 11 + 16 @@ -92,10 +89,9 @@ 3 0 br - plugins/UserCountry/images/flags/br.png + plugins/Morpheus/icons/dist/flags/br.png countryCode==br - 16 - 11 + 16 @@ -108,10 +104,9 @@ 1 0 au - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png countryCode==au - 16 - 11 + 16 @@ -132,10 +127,9 @@ 1 0 ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png countryCode==ca - 16 - 11 + 16 @@ -156,9 +150,8 @@ 1 0 kr - plugins/UserCountry/images/flags/kr.png + plugins/Morpheus/icons/dist/flags/kr.png countryCode==kr - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index ca4f6b23bf..0b3b63e919 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -23,7 +23,7 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -48,7 +48,7 @@ us United States Virginia - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -73,7 +73,7 @@ us United States New Jersey - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -98,7 +98,7 @@ ca Canada Nunavut - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png @@ -123,6 +123,6 @@ kr South Korea Seoul-t'ukpyolsi - plugins/UserCountry/images/flags/kr.png + plugins/Morpheus/icons/dist/flags/kr.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 6e91c71915..fcc6864644 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -80,7 +80,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png North Carolina NC Raleigh @@ -117,10 +117,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -221,7 +221,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA Lake Forest @@ -245,10 +245,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -332,7 +332,7 @@ eur Germany de - plugins/UserCountry/images/flags/de.png + plugins/Morpheus/icons/dist/flags/de.png @@ -381,10 +381,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -485,7 +485,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png @@ -526,10 +526,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -611,7 +611,7 @@ eur Belgium be - plugins/UserCountry/images/flags/be.png + plugins/Morpheus/icons/dist/flags/be.png Limburg 05 Maaseik @@ -652,10 +652,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -739,7 +739,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA San Francisco @@ -788,10 +788,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -873,7 +873,7 @@ asi Japan jp - plugins/UserCountry/images/flags/jp.png + plugins/Morpheus/icons/dist/flags/jp.png Kanagawa 19 Nihon'odori @@ -910,10 +910,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -997,7 +997,7 @@ eur Germany de - plugins/UserCountry/images/flags/de.png + plugins/Morpheus/icons/dist/flags/de.png Nordrhein-Westfalen 07 Weilerswist @@ -1026,10 +1026,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1113,7 +1113,7 @@ eur Germany de - plugins/UserCountry/images/flags/de.png + plugins/Morpheus/icons/dist/flags/de.png Rheinland-Pfalz 08 Mainz @@ -1162,10 +1162,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1289,7 +1289,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Moscow City 48 Moscow @@ -1322,10 +1322,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1409,7 +1409,7 @@ eur Turkey tr - plugins/UserCountry/images/flags/tr.png + plugins/Morpheus/icons/dist/flags/tr.png Rize 53 Esentepe @@ -1450,10 +1450,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1537,7 +1537,7 @@ eur Belgium be - plugins/UserCountry/images/flags/be.png + plugins/Morpheus/icons/dist/flags/be.png Limburg 05 Maaseik @@ -1578,10 +1578,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1671,7 +1671,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -1704,10 +1704,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1789,7 +1789,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -1838,10 +1838,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1965,7 +1965,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -1998,10 +1998,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 94f689d62d..da66ef187d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -155,7 +155,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -192,10 +192,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -292,7 +292,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -329,10 +329,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -472,7 +472,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -509,10 +509,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index d454b9c3db..2e513ce895 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -93,7 +93,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -130,10 +130,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -292,7 +292,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -329,10 +329,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -429,7 +429,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -466,10 +466,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 5a4b100f86..520a06bc6b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -75,7 +75,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -196,7 +196,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png Franche-Comte A6 Besançon @@ -317,7 +317,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -438,7 +438,7 @@ eur Italy it - plugins/UserCountry/images/flags/it.png + plugins/Morpheus/icons/dist/flags/it.png @@ -590,7 +590,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -742,7 +742,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png Franche-Comte A6 Besançon @@ -886,7 +886,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index d7bb4bf39a..50a69b836c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -89,7 +89,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -251,7 +251,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Warwickshire P3 Stratford-upon-Avon @@ -379,7 +379,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png Franche-Comte A6 Besançon @@ -541,7 +541,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png Franche-Comte A6 Besançon @@ -669,7 +669,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -831,7 +831,7 @@ amn Canada ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png British Columbia BC Vancouver @@ -951,7 +951,7 @@ eur Italy it - plugins/UserCountry/images/flags/it.png + plugins/Morpheus/icons/dist/flags/it.png diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 6860c259d7..198d996bfc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -83,7 +83,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA not a city @@ -112,10 +112,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -274,7 +274,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -311,10 +311,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -411,7 +411,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -448,10 +448,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -591,7 +591,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -628,10 +628,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -728,7 +728,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -765,10 +765,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -927,7 +927,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -964,10 +964,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1064,7 +1064,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -1101,10 +1101,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 6b0807d712..f73ae2256a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -123,7 +123,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -253,7 +253,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -417,7 +417,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -563,7 +563,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -693,7 +693,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -823,7 +823,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -943,7 +943,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA not a city diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 6860c259d7..198d996bfc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -83,7 +83,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA not a city @@ -112,10 +112,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -274,7 +274,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -311,10 +311,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -411,7 +411,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -448,10 +448,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -591,7 +591,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -628,10 +628,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -728,7 +728,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -765,10 +765,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -927,7 +927,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -964,10 +964,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1064,7 +1064,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -1101,10 +1101,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 29a0f0d4fb..608a2b87f4 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -83,7 +83,7 @@ amn United States us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png California CA not a city @@ -112,10 +112,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -274,7 +274,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -311,10 +311,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -411,7 +411,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -448,10 +448,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -591,7 +591,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -628,10 +628,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -728,7 +728,7 @@ eur Macedonia mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png Miravci 66 Stratford-upon-Avon @@ -765,10 +765,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -927,7 +927,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -964,10 +964,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1064,7 +1064,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Hluboká nad Vltavou @@ -1101,10 +1101,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1244,7 +1244,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Stratford-upon-Avon @@ -1281,10 +1281,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1381,7 +1381,7 @@ eur Russia ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png Saint Petersburg City 66 Stratford-upon-Avon @@ -1418,10 +1418,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -1580,7 +1580,7 @@ eur United Kingdom gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png Kent G5 Stratford-upon-Avon @@ -1617,10 +1617,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index f9f34d09f3..7df3efc479 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -29,7 +29,7 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -62,7 +62,7 @@ ca Canada British Columbia - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png @@ -95,7 +95,7 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -128,7 +128,7 @@ fr France Franche-Comte - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -159,7 +159,7 @@ ru Russia Saint Petersburg City - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png @@ -192,7 +192,7 @@ ti Tibet Unknown - plugins/UserCountry/images/flags/ti.png + plugins/Morpheus/icons/dist/flags/ti.png @@ -223,7 +223,7 @@ gb United Kingdom London, City of - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -254,7 +254,7 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -285,7 +285,7 @@ gb United Kingdom Kent - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -316,7 +316,7 @@ mk Macedonia Miravci - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png @@ -347,7 +347,7 @@ ru Russia Saint Petersburg City - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png @@ -375,6 +375,6 @@ us United States California - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index 82341bda26..3e1bd4e2cc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -24,10 +24,9 @@ 5 0 gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png countryCode==gb - 16 - 11 + 16 @@ -53,10 +52,9 @@ 3 0 ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png countryCode==ca - 16 - 11 + 16 @@ -82,10 +80,9 @@ 2 0 ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png countryCode==ru - 16 - 11 + 16 @@ -111,10 +108,9 @@ 2 1 us - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png countryCode==us - 16 - 11 + 16 @@ -140,10 +136,9 @@ 1 0 fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 @@ -169,10 +164,9 @@ 1 0 id - plugins/UserCountry/images/flags/id.png + plugins/Morpheus/icons/dist/flags/id.png countryCode==id - 16 - 11 + 16 @@ -198,10 +192,9 @@ 1 0 it - plugins/UserCountry/images/flags/it.png + plugins/Morpheus/icons/dist/flags/it.png countryCode==it - 16 - 11 + 16 @@ -227,10 +220,9 @@ 1 0 mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png countryCode==mk - 16 - 11 + 16 @@ -256,10 +248,9 @@ 1 0 ti - plugins/UserCountry/images/flags/ti.png + plugins/Morpheus/icons/dist/flags/ti.png countryCode==ti - 16 - 11 + 16 @@ -285,9 +276,8 @@ 1 0 xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png countryCode==xx - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index 8d74035038..8e963544ee 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -27,7 +27,7 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -57,7 +57,7 @@ ca Canada British Columbia - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png @@ -87,7 +87,7 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -117,7 +117,7 @@ ru Russia Saint Petersburg City - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png @@ -147,7 +147,7 @@ fr France Franche-Comte - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -177,7 +177,7 @@ gb United Kingdom Kent - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -207,7 +207,7 @@ gb United Kingdom London, City of - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -237,7 +237,7 @@ mk Macedonia Miravci - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png @@ -267,7 +267,7 @@ ti Tibet Unknown - plugins/UserCountry/images/flags/ti.png + plugins/Morpheus/icons/dist/flags/ti.png @@ -292,6 +292,6 @@ us United States California - plugins/UserCountry/images/flags/us.png + plugins/Morpheus/icons/dist/flags/us.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml index f3a9d2a67c..3281980946 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml @@ -24,10 +24,9 @@ 5 0 gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png countryCode==gb - 16 - 11 + 16 @@ -53,9 +52,8 @@ 3 0 ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png countryCode==ca - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index 312160ddd2..e170d8d501 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -31,6 +31,6 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index 14cb04d3d7..01782fba66 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -24,9 +24,8 @@ 2 0 gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png countryCode==gb - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index eb777c4f04..05f987deef 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -28,6 +28,6 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index c8d94aac7e..48db8ab5db 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -24,10 +24,9 @@ 5 0 gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png countryCode==gb - 16 - 11 + 16 @@ -53,10 +52,9 @@ 2 0 ru - plugins/UserCountry/images/flags/ru.png + plugins/Morpheus/icons/dist/flags/ru.png countryCode==ru - 16 - 11 + 16 @@ -82,10 +80,9 @@ 1 0 fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 @@ -111,10 +108,9 @@ 1 0 it - plugins/UserCountry/images/flags/it.png + plugins/Morpheus/icons/dist/flags/it.png countryCode==it - 16 - 11 + 16 @@ -140,9 +136,8 @@ 1 0 mk - plugins/UserCountry/images/flags/mk.png + plugins/Morpheus/icons/dist/flags/mk.png countryCode==mk - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index 092f2c0db8..cb1ce9b492 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -31,6 +31,6 @@ ca Canada British Columbia - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index e4b7c8e8ff..5c1e0ee7b7 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -24,9 +24,8 @@ 3 0 ca - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png countryCode==ca - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index dc4bb6c0af..5b6c579fd9 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -28,6 +28,6 @@ ca Canada British Columbia - plugins/UserCountry/images/flags/ca.png + plugins/Morpheus/icons/dist/flags/ca.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index aefcded3e8..26ea4337d0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -31,7 +31,7 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png @@ -62,6 +62,6 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 69cd5479ef..4b743fcad0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -24,9 +24,8 @@ 3 0 gb - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png countryCode==gb - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 7dc6b84073..bbe13fca3c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -28,6 +28,6 @@ gb United Kingdom Warwickshire - plugins/UserCountry/images/flags/gb.png + plugins/Morpheus/icons/dist/flags/gb.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml index e2562def53..c0135236f8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml @@ -28,6 +28,6 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index d358b9a330..01c30c1a1b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -23,7 +23,7 @@ 2 43 fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr 16 11 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml index a32f142d6e..be4c941999 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml @@ -26,6 +26,6 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index ef0c6d4fcf..7884fcdf89 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -85,7 +85,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -114,10 +114,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -303,7 +303,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -332,10 +332,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml index 0c927196d9..7a36771e5e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml @@ -29,6 +29,6 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index c95226160c..45bb6b9f18 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -24,9 +24,8 @@ 2 43 fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml index 2a364cd566..d1663e0ee4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml @@ -27,6 +27,6 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file 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 c75da162ca..ce7e76cd29 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 @@ -72,7 +72,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -101,10 +101,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -193,7 +193,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -222,10 +222,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 00e9c1cdba..6e1b82df61 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -77,7 +77,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -97,10 +97,10 @@ Sunday, April 7, 2013 Sunday, April 7, 2013 10:00:00 - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -181,7 +181,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -201,10 +201,10 @@ Saturday, April 6, 2013 Saturday, April 6, 2013 11:00:00 - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -285,7 +285,7 @@ unk Unknown xx - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -305,10 +305,10 @@ Friday, April 5, 2013 Friday, April 5, 2013 12:00:00 - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 0fba801755..6b911721dd 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -72,7 +72,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -101,10 +101,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 95b5726131..a20f435ec9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -599,7 +599,7 @@ - +   Unknown @@ -624,7 +624,7 @@ - +   Desktop @@ -762,7 +762,7 @@ - +   Unknown @@ -923,7 +923,7 @@ - +   Unknown @@ -948,7 +948,7 @@ - +   Windows XP @@ -1018,7 +1018,7 @@ - +   Unknown @@ -1043,7 +1043,7 @@ - +   Firefox @@ -1068,7 +1068,7 @@ - +   Opera @@ -1138,7 +1138,7 @@ - +   Unknown @@ -1163,7 +1163,7 @@ - +   Firefox 3.6 @@ -1188,7 +1188,7 @@ - +   Opera 9.63 @@ -1372,7 +1372,7 @@ - +   Unknown @@ -1397,7 +1397,7 @@ - +   Windows @@ -1569,7 +1569,7 @@ - +   Cookie @@ -1582,7 +1582,7 @@ - +   Flash @@ -1595,7 +1595,7 @@ - +   Java @@ -1608,7 +1608,7 @@ - +   Director @@ -1621,7 +1621,7 @@ - +   Gears @@ -1634,7 +1634,7 @@ - +   Pdf @@ -1647,7 +1647,7 @@ - +   Quicktime @@ -1660,7 +1660,7 @@ - +   Realplayer @@ -1673,7 +1673,7 @@ - +   Silverlight @@ -1686,7 +1686,7 @@ - +   Windowsmedia @@ -1708,7 +1708,7 @@ @@ -1744,7 +1744,7 @@ - +   Unknown @@ -1769,7 +1769,7 @@ - +   France @@ -1894,7 +1894,7 @@ @@ -1930,7 +1930,7 @@ - +   Unknown @@ -2055,7 +2055,7 @@ @@ -2091,7 +2091,7 @@ - +   Unknown diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 6369647644..e89f30802e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -578,7 +578,7 @@ - +   Unknown @@ -603,7 +603,7 @@ - +   Desktop @@ -727,7 +727,7 @@ - +   Unknown @@ -874,7 +874,7 @@ - +   Unknown @@ -899,7 +899,7 @@ - +   Windows XP @@ -962,7 +962,7 @@ - +   Unknown @@ -987,7 +987,7 @@ - +   Firefox @@ -1012,7 +1012,7 @@ - +   Opera @@ -1075,7 +1075,7 @@ - +   Unknown @@ -1100,7 +1100,7 @@ - +   Firefox 3.6 @@ -1125,7 +1125,7 @@ - +   Opera 9.63 @@ -1295,7 +1295,7 @@ - +   Unknown @@ -1320,7 +1320,7 @@ - +   Windows @@ -1478,7 +1478,7 @@ - +   Cookie @@ -1491,7 +1491,7 @@ - +   Flash @@ -1504,7 +1504,7 @@ - +   Java @@ -1517,7 +1517,7 @@ - +   Director @@ -1530,7 +1530,7 @@ - +   Gears @@ -1543,7 +1543,7 @@ - +   Pdf @@ -1556,7 +1556,7 @@ - +   Quicktime @@ -1569,7 +1569,7 @@ - +   Realplayer @@ -1582,7 +1582,7 @@ - +   Silverlight @@ -1595,7 +1595,7 @@ - +   Windowsmedia @@ -1646,7 +1646,7 @@ - +   Unknown @@ -1671,7 +1671,7 @@ - +   France @@ -1818,7 +1818,7 @@ - +   Unknown @@ -1965,7 +1965,7 @@ - +   Unknown diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf index adda5aaba5..906bc48da4 100644 Binary files a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 286c0b87bf..406af740bc 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -65,10 +65,9 @@ fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index 7b6386371b..8fac78a731 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -78,10 +78,9 @@ fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index a6d50f68e5..6f949c9790 100644 Binary files a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index d931369c63..65dcc1a5e3 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -98,7 +98,7 @@ eur Poland pl - plugins/UserCountry/images/flags/pl.png + plugins/Morpheus/icons/dist/flags/pl.png @@ -327,7 +327,7 @@ eur Poland pl - plugins/UserCountry/images/flags/pl.png + plugins/Morpheus/icons/dist/flags/pl.png diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 4a63c7e22e..8019f8be6b 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -75,17 +75,15 @@ pl - plugins/UserCountry/images/flags/pl.png + plugins/Morpheus/icons/dist/flags/pl.png countryCode==pl - 16 - 11 + 16 fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 8504c298e6..6b870a80fd 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -181,7 +181,7 @@ eur Poland pl - plugins/UserCountry/images/flags/pl.png + plugins/Morpheus/icons/dist/flags/pl.png @@ -537,7 +537,7 @@ eur Poland pl - plugins/UserCountry/images/flags/pl.png + plugins/Morpheus/icons/dist/flags/pl.png @@ -775,7 +775,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml index 995d52a578..1fbd1b3ea7 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml @@ -40,6 +40,6 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml index 284c301614..c30519b3db 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml @@ -30,10 +30,9 @@ 2 3111.11 pl - plugins/UserCountry/images/flags/pl.png + plugins/Morpheus/icons/dist/flags/pl.png countryCode==pl - 16 - 11 + 16 @@ -54,9 +53,8 @@ 1 10 fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml index 6f6499cc36..3d891a7b3e 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml @@ -38,6 +38,6 @@ xx Unknown Unknown - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index d0e86d01ac..549a8099a7 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -767,7 +767,7 @@ - +   Desktop @@ -905,7 +905,7 @@ - +   Unknown @@ -1043,7 +1043,7 @@ - +   Windows XP @@ -1113,7 +1113,7 @@ - +   Firefox @@ -1183,7 +1183,7 @@ - +   Firefox 3.6 @@ -1321,7 +1321,7 @@ - +   Windows @@ -1447,7 +1447,7 @@ - +   Cookie @@ -1460,7 +1460,7 @@ - +   Flash @@ -1473,7 +1473,7 @@ - +   Java @@ -1486,7 +1486,7 @@ - +   Director @@ -1499,7 +1499,7 @@ - +   Gears @@ -1512,7 +1512,7 @@ - +   Pdf @@ -1525,7 +1525,7 @@ - +   Quicktime @@ -1538,7 +1538,7 @@ - +   Realplayer @@ -1551,7 +1551,7 @@ - +   Silverlight @@ -1564,7 +1564,7 @@ - +   Windowsmedia @@ -1586,7 +1586,7 @@ @@ -1622,7 +1622,7 @@ - +   Poland @@ -1647,7 +1647,7 @@ - +   France @@ -1749,7 +1749,7 @@ @@ -1785,7 +1785,7 @@ - +   Unknown @@ -1910,7 +1910,7 @@ @@ -1946,7 +1946,7 @@ - +   Unknown diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index e4e55f4bc1..f9f4d5404a 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -739,7 +739,7 @@ - +   Desktop @@ -863,7 +863,7 @@ - +   Unknown @@ -987,7 +987,7 @@ - +   Windows XP @@ -1050,7 +1050,7 @@ - +   Firefox @@ -1113,7 +1113,7 @@ - +   Firefox 3.6 @@ -1237,7 +1237,7 @@ - +   Windows @@ -1349,7 +1349,7 @@ - +   Cookie @@ -1362,7 +1362,7 @@ - +   Flash @@ -1375,7 +1375,7 @@ - +   Java @@ -1388,7 +1388,7 @@ - +   Director @@ -1401,7 +1401,7 @@ - +   Gears @@ -1414,7 +1414,7 @@ - +   Pdf @@ -1427,7 +1427,7 @@ - +   Quicktime @@ -1440,7 +1440,7 @@ - +   Realplayer @@ -1453,7 +1453,7 @@ - +   Silverlight @@ -1466,7 +1466,7 @@ - +   Windowsmedia @@ -1517,7 +1517,7 @@ - +   Poland @@ -1542,7 +1542,7 @@ - +   France @@ -1666,7 +1666,7 @@ - +   Unknown @@ -1813,7 +1813,7 @@ - +   Unknown diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf index 8bf8259f0d..a22fba16e5 100644 Binary files a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml index 1e511f6135..c807579102 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml @@ -11,9 +11,8 @@ 4 0 fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index f01ce588fb..fc0189404c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -62,10 +62,9 @@ fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -72,7 +72,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -109,10 +109,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -199,7 +199,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -236,10 +236,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -387,7 +387,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -428,10 +428,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -72,7 +72,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -109,10 +109,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -199,7 +199,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -236,10 +236,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -387,7 +387,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -428,10 +428,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index d9f537271f..7cae27dd3a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -30,7 +30,7 @@ fr 2 - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png France @@ -123,7 +123,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -160,10 +160,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -250,7 +250,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -287,10 +287,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml index f01ce588fb..fc0189404c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml @@ -62,10 +62,9 @@ fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png countryCode==fr - 16 - 11 + 16 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -72,7 +72,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -109,10 +109,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -199,7 +199,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -236,10 +236,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -387,7 +387,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -428,10 +428,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index de354fdde7..26352512c9 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -72,7 +72,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -109,10 +109,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -199,7 +199,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -236,10 +236,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -387,7 +387,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -428,10 +428,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index d9f537271f..7cae27dd3a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -30,7 +30,7 @@ fr 2 - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png France @@ -123,7 +123,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -160,10 +160,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 @@ -250,7 +250,7 @@ eur France fr - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -287,10 +287,10 @@ - 0.00 + 0 0 0 - 0.00 + 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml index 171e7338ad..57ad67177d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -16,7 +16,7 @@ au Australia Victoria - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png @@ -34,7 +34,7 @@ fr France Provence-Alpes-Cote d'Azur - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -46,6 +46,6 @@ 0 35 0 - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml index cc6727dc54..7c39516a86 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -15,7 +15,7 @@ fr France Provence-Alpes-Cote d'Azur - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -32,7 +32,7 @@ au Australia Victoria - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png @@ -44,6 +44,6 @@ 0 35 0 - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml index ff7ba019b4..d260f831b8 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml @@ -10,7 +10,7 @@ 0 35 0 - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -28,7 +28,7 @@ au Australia Victoria - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png @@ -46,6 +46,6 @@ fr France Provence-Alpes-Cote d'Azur - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml index 4680c84581..5d1560212f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml @@ -10,7 +10,7 @@ 0 35 0 - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png @@ -27,7 +27,7 @@ fr France Provence-Alpes-Cote d'Azur - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -44,6 +44,6 @@ au Australia Victoria - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml index 171e7338ad..57ad67177d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml @@ -16,7 +16,7 @@ au Australia Victoria - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png @@ -34,7 +34,7 @@ fr France Provence-Alpes-Cote d'Azur - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -46,6 +46,6 @@ 0 35 0 - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml index cc6727dc54..7c39516a86 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml @@ -15,7 +15,7 @@ fr France Provence-Alpes-Cote d'Azur - plugins/UserCountry/images/flags/fr.png + plugins/Morpheus/icons/dist/flags/fr.png @@ -32,7 +32,7 @@ au Australia Victoria - plugins/UserCountry/images/flags/au.png + plugins/Morpheus/icons/dist/flags/au.png @@ -44,6 +44,6 @@ 0 35 0 - plugins/UserCountry/images/flags/xx.png + plugins/Morpheus/icons/dist/flags/xx.png \ No newline at end of file diff --git a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png index 25de05506d..fc3b19e165 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:841bc41ed9926768f1cca3f13f4bf7b9b3270d1da3e626805793f585a410d69c -size 467099 +oid sha256:b3c4e5fd742348492ca86f4409f9cbf9371221cd2d7198919e22ac72501fb49f +size 467356 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 2e905c2a38..8dd98cfdbe 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a12c91b95c462b640e045f226c3473932892b5a92bd190ae312672650e785e23 -size 1448761 +oid sha256:40fa47ca0be52a7e1e9b3a3c991788b8f7938989e4a6a96d938219422acdb81e +size 1447082 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index bb577a268a..93b6f70d28 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fdde96d9eee84ebfe9a93d386eda2a5f653cd9c715ed1ab71d929a9d8e64c56 -size 428222 +oid sha256:7e8bac31646c54e6bf3addbe0286b6f16245a83e3a09558a07d1289cabb27e06 +size 428512 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index df0c907d9d..f600970845 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d94c2d36cb25289fb20e1f7777d6dc7b5eebe7413b248e04216e8ffc63ae8b6f -size 453380 +oid sha256:2d7ff08569369ed7a290d9a07dff56dc5199207053c7fdae42abc15c265b1ec9 +size 451587 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png index 656b7c6d7f..5f55bcaab9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f28635c160528c866556db17a448e1f54eaee804352bbf42a10a9b1160b20b09 -size 196505 +oid sha256:769f6bb2140bf6270a41321fa32b60d26f9822cfa446701e3671c8cca6c1ee41 +size 196103 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png index 4f81381671..9ddd0328ec 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6d32e848ad796b951e76b59c60dcb116c2a696e87e4b1e461a38543ee503496 -size 197006 +oid sha256:e61cfc01c7af201b6d2d707a2a5e238a557ecc8fd8267551f1ff2da2b6e675ce +size 196603 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png index 4150fa7089..0a4d512277 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7de59d3457826bbd15039bfd7c35e6a322120db89edcb9bebc2b43df45cc9dd -size 803484 +oid sha256:feda268a7117f452cba4eb695cdc39abd5b7068597d7c2ce3a7eeee797f592e6 +size 804380 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png index 6e8da54c2d..833931cb7b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f06ec8e680da552dc576ab6ae148991cc106104b42a9aff89a3cfd6ed2a27879 -size 228716 +oid sha256:6571be1d79e9e8180ebb82f521698e85bb34f2cde8aeaae490ce45d82ce5dfb4 +size 228752 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png index baf870442f..e14182cff4 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fc03e1db0efa7bb2008094f68c7a7617b09694a290aec95c5c244e0328bed34 -size 173561 +oid sha256:154e7aa39b4891cf54a1b8639fc856d8c9b966b5bb3f933d7ff499542bee2db4 +size 172904 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index daf33b8ea8..5db9932c1c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8097dd425997c11934e909e050768f1131dea60f19c725a5c9aa295e6a6f6f3b -size 113271 +oid sha256:d98e92f3427f99f5057ab30a68b82ee69f5790cb0860643ca8673ea99b406bbb +size 113148 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png index f5b1096d43..e0428c4d74 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb7d254aa2b3a60ad890d54b2f1686c1f9805e824c6c35e3f0ae7ff66eaa5eb5 -size 110260 +oid sha256:658893bddff5b10cd8d9a52300b7854bbee6b72dc4bdc3b832049cbc2b196791 +size 109515 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png index f87692ce69..b4bef9d7cc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d6fbe98fbae04f3186b86acd70e269badabd1cfe8e818fe3e628a1e44571629 -size 448495 +oid sha256:9735d7df7a8fb2d91eb8922eea1fd6ad742232f8989cd3629c7af699b02d0625 +size 446145 -- cgit v1.2.3 From abbf4a3951ddc90ae4fd737a5c930fb36c69face Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Thu, 30 Mar 2017 22:13:06 +0200 Subject: Improve header layout of error, update and maintenance screen (#11561) * Improve layout of error and maintenance scrrens * improve header on update pages * use svg logo as default * update screenshots --- tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png | 4 ++-- tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png | 4 ++-- tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png | 4 ++-- tests/UI/expected-screenshots/CoreUpdaterDb_main.png | 4 ++-- tests/UI/expected-screenshots/CoreUpdaterDb_updated.png | 4 ++-- tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png | 4 ++-- .../UIIntegrationTest_widgetize_apidisallowed.png | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png b/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png index d8f616e021..ab15352f32 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png +++ b/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a6ac1c08cf9741c75912f738644f22eac1dd733fba90b11337b1c9d458b3548 -size 56883 +oid sha256:6db8ea812b4c025d3c5f3c3b6841b6fa7e0ffc53c9f15bcf3bf08c1c935cc444 +size 55769 diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png b/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png index f2c309a950..ca41c0251f 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png +++ b/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb41825f8b99e30f19d10f3835d0d8579e9d3e731aad5c6023865cf7dfbbfb29 -size 99028 +oid sha256:a15a4cc2c2eef49d326e3c3ab8e879e16b15f3db8e3703b53337fad7d8baa92d +size 98232 diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png b/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png index c8bcd22ae5..864db2b917 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png +++ b/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8bb4b50b39944cd1c0cf8b5a282c8ec4ec8223d4e760ee79c333225bfb1ca04 -size 106399 +oid sha256:dc0381732a8de0a1dda12ed8d021f4526a71ad2c750faf3bfa7d8c4847b954c3 +size 105284 diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index e2330d0dd6..fa6f940efc 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8561ee39fc47919209492fa0ff7d19913fddc0c47bcece0c87f956487e1a2e4a -size 289021 +oid sha256:a4d34bec02cb09474bc37a7a5849088066390febec6a344cd10eb483627559c7 +size 287997 diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png index b855411727..26ea1cda48 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png +++ b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03c097db06daa76df4c9bc9eab062b3830c49364898467ff0d5c3db920efef28 -size 76446 +oid sha256:0f26afe60c3accd1cf614fcb9dcb786230d86fa8372e76d664a359ff939798eb +size 75501 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png index 4f97756072..89d6568b78 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:227d0ade8b369c8337609b40585164ab90f219b8e6ecc5983a6f2356ae7390c9 -size 75520 +oid sha256:e6506ebd66b5a115207ebfadc7ebee42ce1070a12675260b97fa86c483403923 +size 74504 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png index 7d3579d52f..8f779e9914 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac2b019ed247ac357c2cda8f7009c14c2add84e366084390e039342dafecc077 -size 51963 +oid sha256:750c30bb164fe68397b877d7556d4a8db53d9f3bacd3adc1fa14d0281f679677 +size 51089 -- cgit v1.2.3 From ea6491028c4f90948d70ca51167f996fa6c3136a Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Thu, 30 Mar 2017 23:22:14 +0200 Subject: Improves "No data has been recorded yet" page (#11555) * Improve 'No data recorded yet' page * updates expected UI screenshots * slightly improve text * update screenshot --- tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png | 4 ++-- tests/UI/expected-screenshots/Installation_js_tracking.png | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png index 0ec9b44b84..6433c2ab72 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce3bd400dcd3586fe1874141e386997bc4d3983f73a94beb58e2e43fb76ffbed -size 178968 +oid sha256:e2c131f981a3d5ac09c7f035a3f855bc35f4e7ec9bf3083c475df5a770ce90f5 +size 217051 diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png index f763bd2c8a..1c80945c89 100644 --- a/tests/UI/expected-screenshots/Installation_js_tracking.png +++ b/tests/UI/expected-screenshots/Installation_js_tracking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fcce42eb580e158fd1eac73e2146360a33594e65f5d925e561698b07f38dc3d -size 192902 +oid sha256:83be8b2ff81e007f67f2f3339ba1ca9bb2c6fd0b3761382a5078bf69c9e4cde9 +size 222090 -- cgit v1.2.3 From f10b98a306f101b3684ec77574596d4fdaf7dd26 Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Mon, 3 Apr 2017 21:58:13 +0200 Subject: Fix action enumeration in visitorlog (#11577) * fix action enumeration in visitorlog * update expected screenshots --- tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png | 4 ++-- tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png | 4 ++-- .../expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png | 4 ++-- .../expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 8dd98cfdbe..fbdf7fa122 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40fa47ca0be52a7e1e9b3a3c991788b8f7938989e4a6a96d938219422acdb81e -size 1447082 +oid sha256:06c191f3c60d5aaa5eefe76269763bdcfa1ee4a71c47a6a1514e095a5421993d +size 1446632 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index f600970845..b933377013 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d7ff08569369ed7a290d9a07dff56dc5199207053c7fdae42abc15c265b1ec9 -size 451587 +oid sha256:06f016ae54dce5d636a6b03b2ec4a82742b99f25135ac01014e3e1522ede4612 +size 451177 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png index b4bef9d7cc..17240d640a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9735d7df7a8fb2d91eb8922eea1fd6ad742232f8989cd3629c7af699b02d0625 -size 446145 +oid sha256:e65a25e2cb17caa1c0ceb8e3a2466491e270d2c0a26c24322b6e9572fe01324d +size 445631 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index 454685d2df..9510f82db0 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:924d507d83b7d46da6fd2e6d6e2f4a57cc4f125915b9358d552cf414b7393974 -size 631447 +oid sha256:a82901cf3a852302466e14f1d022c94e083eb698733a6b1b548a442058f0a231 +size 633000 -- cgit v1.2.3