diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-01-07 03:52:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 03:52:42 +0300 |
| commit | 4fc054b0219d4c1c35c47616536488d6ff10d0dd (patch) | |
| tree | 8c27cb0ebb16adcf27803a8be9c285fbbfb31f1f | |
| parent | d16f5b2de775cabcac62b518b1fa5f5908c5fd36 (diff) | |
Update submodules. (#13936)
* Update submodules.
* Update expected files.
* Fix more integration tests.
* Update submodule.
* Update screenshots.
27 files changed, 374 insertions, 365 deletions
diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index c0d3add182..3395a14b9c 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -1,7 +1,7 @@ ------------------------------------------------------- Using this 'archive.php' script is no longer recommended. -Please use '/path/to/php /home/travis/build/matomo-org/matomo/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead. +Please use '/path/to/php /home/travis/build/matomo-org/matomo/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php --force-date-last-n=10' instead. To get help use '/path/to/php /home/travis/build/matomo-org/matomo/tests/PHPUnit/proxy/../../..//console core:archive --help' See also: https://matomo.org/docs/setup-auto-archiving/ diff --git a/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php index 935170df46..4ca96d1c58 100644 --- a/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php @@ -15,6 +15,7 @@ use Piwik\Tests\Framework\Fixture; use Piwik\UpdateCheck; use Piwik\Version; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; +use Piwik\View; /** * @group Plugins @@ -69,20 +70,23 @@ class UpdateCommunicationTest extends IntegrationTestCase public function test_sendNotifications_shouldSentCorrectEmail() { $rootUrl = Fixture::getTestRootUrl(); - $message = "ScheduledReports_EmailHello + $message = "<p>ScheduledReports_EmailHello</p> -CoreUpdater_ThereIsNewVersionAvailableForUpdate +<p>CoreUpdater_ThereIsNewVersionAvailableForUpdate</p> -CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage +<p>CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage<br/> {$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable +</p> -CoreUpdater_ViewVersionChangelog -https://matomo.org/changelog/matomo-33-0-0/ +<p> + CoreUpdater_ViewVersionChangelog + <br/> + https://matomo.org/changelog/matomo-33-0-0/ +</p> -CoreUpdater_ReceiveEmailBecauseIsSuperUser - -CoreUpdater_FeedbackRequest -https://matomo.org/contact/"; +<p>CoreUpdater_ReceiveEmailBecauseIsSuperUser</p> +<p>CoreUpdater_FeedbackRequest<br/>https://matomo.org/contact/</p> +"; $this->assertEmailForVersion('33.0.0', $message); } @@ -90,17 +94,18 @@ https://matomo.org/contact/"; public function test_sendNotifications_shouldNotIncludeChangelogIfNotMajorVersionUpdate() { $rootUrl = Fixture::getTestRootUrl(); - $message = "ScheduledReports_EmailHello + $message = "<p>ScheduledReports_EmailHello</p> -CoreUpdater_ThereIsNewVersionAvailableForUpdate +<p>CoreUpdater_ThereIsNewVersionAvailableForUpdate</p> -CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage +<p>CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage<br/> {$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable +</p> -CoreUpdater_ReceiveEmailBecauseIsSuperUser -CoreUpdater_FeedbackRequest -https://matomo.org/contact/"; +<p>CoreUpdater_ReceiveEmailBecauseIsSuperUser</p> +<p>CoreUpdater_FeedbackRequest<br/>https://matomo.org/contact/</p> +"; $this->assertEmailForVersion('33.0.0-b1', $message); } @@ -114,7 +119,10 @@ https://matomo.org/contact/"; $mock = $this->getCommunicationMock(array('sendEmailNotification')); $mock->expects($this->once()) ->method('sendEmailNotification') - ->with($this->equalTo($subject), $this->equalTo($expectedMessage)); + ->with($this->equalTo($subject), $this->callback(function (View $view) use ($expectedMessage) { + $this->assertEquals($expectedMessage, $view->render()); + return true; + })); $mock->sendNotificationIfUpdateAvailable(); } diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 94e00f49db0c832b03653d8f993ea14a89694fc +Subproject 2cca6e6b2f34e825f5d0fbe95f41879b39e55a0 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index bfcb70da0b..0ab89f2b69 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c41c03610be3d1697fd92c5f1611c477d504f675758ee7a06ca337b07b4a6143 -size 647160 +oid sha256:fa2b2bae8ba2892e78adf4eef2e0433e3fc1ad585ae598ff0ec007a17affd725 +size 653845 diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index 055ea20470..05b475c76e 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html index dfe62a90fb..0b733a37eb 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_week.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=week&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=week&date=today-date-removed-in-tests"> Dashboard </a> </td> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html index 9029a73b89..f157c845a6 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_week.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 5598fd0736..78aeea5795 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> @@ -44,377 +43,377 @@ Report list </h2> <ul> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#MultiSites_getAll" style="text-decoration:none; color: #0d0d0d;"> All Websites dashboard </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitsSummary_get" style="text-decoration:none; color: #0d0d0d;"> Visits Summary </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCountry" style="text-decoration:none; color: #0d0d0d;"> Country </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getContinent" style="text-decoration:none; color: #0d0d0d;"> Continent </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getRegion" style="text-decoration:none; color: #0d0d0d;"> Region </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: #0d0d0d;"> Browser language </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCity" style="text-decoration:none; color: #0d0d0d;"> City </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: #0d0d0d;"> Language code </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getType" style="text-decoration:none; color: #0d0d0d;"> Device type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getModel" style="text-decoration:none; color: #0d0d0d;"> Device model </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: #0d0d0d;"> Device brand </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getResolution" style="text-decoration:none; color: #0d0d0d;"> Screen Resolution </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: #0d0d0d;"> Operating System versions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: #0d0d0d;"> Browsers </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: #0d0d0d;"> Browser version </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getConfiguration" style="text-decoration:none; color: #0d0d0d;"> Configurations </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: #0d0d0d;"> Operating System families </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: #0d0d0d;"> Browser engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicePlugins_getPlugin" style="text-decoration:none; color: #0d0d0d;"> Browser Plugins </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: #0d0d0d;"> Visits per local time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: #0d0d0d;"> Visits per server time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> Visits by Day of Week </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserId_getUsers" style="text-decoration:none; color: #0d0d0d;"> User IDs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: #0d0d0d;"> Custom Variables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_get" style="text-decoration:none; color: #0d0d0d;"> Actions - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Bandwidth_get" style="text-decoration:none; color: #0d0d0d;"> Bandwidth - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrls" style="text-decoration:none; color: #0d0d0d;"> Page URLs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: #0d0d0d;"> Entry pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: #0d0d0d;"> Entry page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: #0d0d0d;"> Exit pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: #0d0d0d;"> Exit page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitles" style="text-decoration:none; color: #0d0d0d;"> Page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: #0d0d0d;"> Site Search Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Pages Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: #0d0d0d;"> Search Keywords with No Results </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Page Titles Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: #0d0d0d;"> Search Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getOutlinks" style="text-decoration:none; color: #0d0d0d;"> Outlinks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getDownloads" style="text-decoration:none; color: #0d0d0d;"> Downloads </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getCategory" style="text-decoration:none; color: #0d0d0d;"> Event Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getAction" style="text-decoration:none; color: #0d0d0d;"> Event Actions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getName" style="text-decoration:none; color: #0d0d0d;"> Event Names </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentNames" style="text-decoration:none; color: #0d0d0d;"> Content Name </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentPieces" style="text-decoration:none; color: #0d0d0d;"> Content Piece </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> Length of Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> Pages per Visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> Visits by Visit Number </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: #0d0d0d;"> Visits by days since last visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitFrequency_get" style="text-decoration:none; color: #0d0d0d;"> Returning Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getReferrerType" style="text-decoration:none; color: #0d0d0d;"> Channel Type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getAll" style="text-decoration:none; color: #0d0d0d;"> All Channels </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getKeywords" style="text-decoration:none; color: #0d0d0d;"> Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: #0d0d0d;"> Search Engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getWebsites" style="text-decoration:none; color: #0d0d0d;"> Websites </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSocials" style="text-decoration:none; color: #0d0d0d;"> Social Networks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getCampaigns" style="text-decoration:none; color: #0d0d0d;"> Campaigns </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get_idGoal--ecommerceOrder" style="text-decoration:none; color: #0d0d0d;"> Ecommerce Orders </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: #0d0d0d;"> Ecommerce Orders - Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: #0d0d0d;"> Ecommerce Orders - Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: #0d0d0d;"> Abandoned Carts </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: #0d0d0d;"> Abandoned Carts - Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: #0d0d0d;"> Abandoned Carts - Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getItemsName" style="text-decoration:none; color: #0d0d0d;"> Product Name </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getItemsSku" style="text-decoration:none; color: #0d0d0d;"> Product SKU </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getItemsCategory" style="text-decoration:none; color: #0d0d0d;"> Product Category </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get" style="text-decoration:none; color: #0d0d0d;"> Goals </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: #0d0d0d;"> Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: #0d0d0d;"> Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get_idGoal--1" style="text-decoration:none; color: #0d0d0d;"> Goal title match, triggered ONCE </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion_idGoal--1" style="text-decoration:none; color: #0d0d0d;"> title match, triggered ONCE - Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion_idGoal--1" style="text-decoration:none; color: #0d0d0d;"> title match, triggered ONCE - Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperatures" style="text-decoration:none; color: #0d0d0d;"> Data tables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperaturesEvolution" style="text-decoration:none; color: #0d0d0d;"> Temperatures evolution over time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatios" style="text-decoration:none; color: #0d0d0d;"> Pie graph </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatiosWithLogos" style="text-decoration:none; color: #0d0d0d;"> Advanced tag cloud: with logos and links </a> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html index 24449c0595..c492f92ea5 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> @@ -44,377 +43,377 @@ Report list </h2> <ul> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#MultiSites_getAll" style="text-decoration:none; color: #0d0d0d;"> All Websites dashboard </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitsSummary_get" style="text-decoration:none; color: #0d0d0d;"> Visits Summary </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCountry" style="text-decoration:none; color: #0d0d0d;"> Country </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getContinent" style="text-decoration:none; color: #0d0d0d;"> Continent </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getRegion" style="text-decoration:none; color: #0d0d0d;"> Region </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: #0d0d0d;"> Browser language </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCity" style="text-decoration:none; color: #0d0d0d;"> City </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: #0d0d0d;"> Language code </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getType" style="text-decoration:none; color: #0d0d0d;"> Device type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getModel" style="text-decoration:none; color: #0d0d0d;"> Device model </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: #0d0d0d;"> Device brand </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getResolution" style="text-decoration:none; color: #0d0d0d;"> Screen Resolution </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: #0d0d0d;"> Operating System versions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: #0d0d0d;"> Browsers </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: #0d0d0d;"> Browser version </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getConfiguration" style="text-decoration:none; color: #0d0d0d;"> Configurations </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: #0d0d0d;"> Operating System families </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: #0d0d0d;"> Browser engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicePlugins_getPlugin" style="text-decoration:none; color: #0d0d0d;"> Browser Plugins </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: #0d0d0d;"> Visits per local time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: #0d0d0d;"> Visits per server time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> Visits by Day of Week </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserId_getUsers" style="text-decoration:none; color: #0d0d0d;"> User IDs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: #0d0d0d;"> Custom Variables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_get" style="text-decoration:none; color: #0d0d0d;"> Actions - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Bandwidth_get" style="text-decoration:none; color: #0d0d0d;"> Bandwidth - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrls" style="text-decoration:none; color: #0d0d0d;"> Page URLs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: #0d0d0d;"> Entry pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: #0d0d0d;"> Entry page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: #0d0d0d;"> Exit pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: #0d0d0d;"> Exit page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitles" style="text-decoration:none; color: #0d0d0d;"> Page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: #0d0d0d;"> Site Search Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Pages Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: #0d0d0d;"> Search Keywords with No Results </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Page Titles Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: #0d0d0d;"> Search Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getOutlinks" style="text-decoration:none; color: #0d0d0d;"> Outlinks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getDownloads" style="text-decoration:none; color: #0d0d0d;"> Downloads </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getCategory" style="text-decoration:none; color: #0d0d0d;"> Event Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getAction" style="text-decoration:none; color: #0d0d0d;"> Event Actions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getName" style="text-decoration:none; color: #0d0d0d;"> Event Names </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentNames" style="text-decoration:none; color: #0d0d0d;"> Content Name </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentPieces" style="text-decoration:none; color: #0d0d0d;"> Content Piece </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> Length of Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> Pages per Visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> Visits by Visit Number </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: #0d0d0d;"> Visits by days since last visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitFrequency_get" style="text-decoration:none; color: #0d0d0d;"> Returning Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getReferrerType" style="text-decoration:none; color: #0d0d0d;"> Channel Type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getAll" style="text-decoration:none; color: #0d0d0d;"> All Channels </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getKeywords" style="text-decoration:none; color: #0d0d0d;"> Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: #0d0d0d;"> Search Engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getWebsites" style="text-decoration:none; color: #0d0d0d;"> Websites </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSocials" style="text-decoration:none; color: #0d0d0d;"> Social Networks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getCampaigns" style="text-decoration:none; color: #0d0d0d;"> Campaigns </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get_idGoal--ecommerceOrder" style="text-decoration:none; color: #0d0d0d;"> Ecommerce Orders </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: #0d0d0d;"> Ecommerce Orders - Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: #0d0d0d;"> Ecommerce Orders - Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: #0d0d0d;"> Abandoned Carts </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: #0d0d0d;"> Abandoned Carts - Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: #0d0d0d;"> Abandoned Carts - Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getItemsName" style="text-decoration:none; color: #0d0d0d;"> Product Name </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getItemsSku" style="text-decoration:none; color: #0d0d0d;"> Product SKU </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getItemsCategory" style="text-decoration:none; color: #0d0d0d;"> Product Category </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get" style="text-decoration:none; color: #0d0d0d;"> Goals </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: #0d0d0d;"> Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: #0d0d0d;"> Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get_idGoal--1" style="text-decoration:none; color: #0d0d0d;"> Goal title match, triggered ONCE </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion_idGoal--1" style="text-decoration:none; color: #0d0d0d;"> title match, triggered ONCE - Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion_idGoal--1" style="text-decoration:none; color: #0d0d0d;"> title match, triggered ONCE - Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperatures" style="text-decoration:none; color: #0d0d0d;"> Data tables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperaturesEvolution" style="text-decoration:none; color: #0d0d0d;"> Temperatures evolution over time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatios" style="text-decoration:none; color: #0d0d0d;"> Pie graph </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatiosWithLogos" style="text-decoration:none; color: #0d0d0d;"> Advanced tag cloud: with logos and links </a> diff --git a/plugins/Login/tests/Integration/PasswordResetterTest.php b/plugins/Login/tests/Integration/PasswordResetterTest.php index 27196b3ae4..4ae99797bb 100644 --- a/plugins/Login/tests/Integration/PasswordResetterTest.php +++ b/plugins/Login/tests/Integration/PasswordResetterTest.php @@ -145,8 +145,8 @@ class PasswordResetterTest extends IntegrationTestCase return [ 'observers.global' => [ ['Mail.send', function (Mail $mail) { - $body = $mail->getBodyText(true); - preg_match('/resetToken=3D([a-zA-Z0-9=\s]+?)=0A/', $body, $matches); + $body = $mail->getBodyHtml(true); + preg_match('/resetToken=3D([a-zA-Z0-9=\s]+?)<\/p>/', $body, $matches); $capturedToken = $matches[1]; $capturedToken = preg_replace('/=\s*/', '', $capturedToken); $this->capturedToken = $capturedToken; diff --git a/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php b/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php index bb7f46fba7..4b1ab846fe 100644 --- a/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php +++ b/plugins/Marketplace/tests/Integration/UpdateCommunicationTest.php @@ -15,6 +15,7 @@ use Piwik\Plugins\CoreUpdater\SystemSettings; use Piwik\Plugins\Marketplace\UpdateCommunication; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; +use Piwik\View; /** * @group Plugins @@ -117,23 +118,33 @@ class UpdateCommunicationTest extends IntegrationTestCase { $subject = 'CoreUpdater_NotificationSubjectAvailablePluginUpdate'; $rootUrl = Fixture::getTestRootUrl(); - $message = "ScheduledReports_EmailHello + $message = "<p>ScheduledReports_EmailHello</p> +<p>CoreUpdater_ThereIsNewPluginVersionAvailableForUpdate</p> -CoreUpdater_ThereIsNewPluginVersionAvailableForUpdate +<ul> +<li>MyTest1 33.0.0</li> +<li>MyTest2 32.0.0</li> +<li>MyTest3 31.0.0</li> +</ul> - * MyTest1 33.0.0 - * MyTest2 32.0.0 - * MyTest3 31.0.0 -CoreUpdater_NotificationClickToUpdatePlugins +<p> +CoreUpdater_NotificationClickToUpdatePlugins<br/> {$rootUrl}index.php?module=CorePluginsAdmin&action=plugins +</p> -Installation_HappyAnalysing"; +<p> +Installation_HappyAnalysing +</p> +"; $mock = $this->getCommunicationMockHavingManyUpdates(); $mock->expects($this->once())->method('sendEmailNotification') - ->with($this->equalTo($subject), $this->equalTo($message)); + ->with($this->equalTo($subject), $this->callback(function (View $view) use ($message) { + $this->assertEquals($message, $view->render()); + return true; + })); $mock->sendNotificationIfUpdatesAvailable(); } diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png index d79ebf3db6..4bd4a9d706 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38a281706673c0b45759426dadb88d6689d802d3a8a29cc1aa3b537c1a5bc58e -size 610262 +oid sha256:ffdd4dc602758bd24b8075764a05df7336af8be9a681259a0f32ae5255852970 +size 610145 diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject 2fe05a4ab27a04706e8285ff6c9379fc27ef8d4 +Subproject 8b218588ec77004c8494a8fa2b80110fd2dbc1a diff --git a/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php b/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php index 2c89da4134..cb55ffecd8 100644 --- a/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php +++ b/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php @@ -52,7 +52,7 @@ class AttachedFileReportEmailGeneratorTest extends IntegrationTestCase $mail = $this->testInstance->makeEmail($generatedReport); $mailContent = $this->getMailContent($mail); - $this->assertStringStartsWith('=0A<html', $mail->getBodyHtml()->getContent()); + $this->assertStringStartsWith('<html', $mail->getBodyHtml()->getContent()); $this->assertEquals('General_Report report - pretty date', $mail->getSubject()); $this->assertContains('ScheduledReports_PleaseFindAttachedFile', $mailContent); $this->assertContains('ScheduledReports_SentFromX', $mailContent); @@ -99,7 +99,7 @@ Content-Disposition: inline; filename="General_Report report - pretty date.thing $mail = $this->testInstance->makeEmail($generatedReport); $mailContent = $this->getMailContent($mail); - $this->assertStringStartsWith('=0A<html', $mailContent); + $this->assertStringStartsWith('<html', $mailContent); $this->assertContains('ScheduledReports_PleaseFindAttachedFile', $mailContent); $this->assertEquals('Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable @@ -129,7 +129,7 @@ Content-Disposition: inline $mail = $this->testInstance->makeEmail($generatedReport); $mailContent = $this->getMailContent($mail); - $this->assertStringStartsWith('=0A<html', $mailContent); + $this->assertStringStartsWith('<html', $mailContent); $this->assertContains("ScheduledReports_PleaseFindAttachedFile", $mailContent); $this->assertContains('ScheduledReports_SentFromX=', $mailContent); $this->assertContains('ScheduledReports_CustomVisitorSegment', $mailContent); diff --git a/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php b/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php index 9b07e574ca..d2c3be30d1 100644 --- a/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php +++ b/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php @@ -121,7 +121,7 @@ Content-Disposition: inline; filename="file2.txt" $this->assertEquals('test@testytesterson.com', $mail->getReplyTo()); $this->assertEquals([ 'From' => [ - 0 => 'ScheduledReports_PiwikReports <noreply@localhost>', + 0 => 'TagManager_MatomoTagName <noreply@localhost>', 'append' => true, ], 'Subject' => [ diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png index 18288b26be..db5c9c5d34 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e2f223eca26aec2084e6908f3994e356e2c64b932b23e05f103ee24e5f0bcd6 -size 139507 +oid sha256:432d04719b40530913c1c0230d3a36c98a7d04f76977ff5f4795055f3b0d395d +size 139500 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html index 9333472c6d..c800ede978 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html index 294a83bbbd..1733510e21 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=week&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=week&date=today-date-removed-in-tests"> Dashboard </a> </td> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html index 51b3f1ff77..2939f2198b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 2aa8cd7363..cbd5473d41 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> @@ -44,317 +43,317 @@ Report list </h2> <ul> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#MultiSites_getAll" style="text-decoration:none; color: #0d0d0d;"> All Websites dashboard </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitsSummary_get" style="text-decoration:none; color: #0d0d0d;"> Visits Summary </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCountry" style="text-decoration:none; color: #0d0d0d;"> Country </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getContinent" style="text-decoration:none; color: #0d0d0d;"> Continent </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getRegion" style="text-decoration:none; color: #0d0d0d;"> Region </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: #0d0d0d;"> Browser language </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCity" style="text-decoration:none; color: #0d0d0d;"> City </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: #0d0d0d;"> Language code </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getType" style="text-decoration:none; color: #0d0d0d;"> Device type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getModel" style="text-decoration:none; color: #0d0d0d;"> Device model </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: #0d0d0d;"> Device brand </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getResolution" style="text-decoration:none; color: #0d0d0d;"> Screen Resolution </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: #0d0d0d;"> Operating System versions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: #0d0d0d;"> Browsers </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: #0d0d0d;"> Browser version </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getConfiguration" style="text-decoration:none; color: #0d0d0d;"> Configurations </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: #0d0d0d;"> Operating System families </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: #0d0d0d;"> Browser engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicePlugins_getPlugin" style="text-decoration:none; color: #0d0d0d;"> Browser Plugins </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: #0d0d0d;"> Visits per local time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: #0d0d0d;"> Visits per server time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> Visits by Day of Week </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserId_getUsers" style="text-decoration:none; color: #0d0d0d;"> User IDs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: #0d0d0d;"> Custom Variables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_get" style="text-decoration:none; color: #0d0d0d;"> Actions - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Bandwidth_get" style="text-decoration:none; color: #0d0d0d;"> Bandwidth - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrls" style="text-decoration:none; color: #0d0d0d;"> Page URLs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: #0d0d0d;"> Entry pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: #0d0d0d;"> Entry page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: #0d0d0d;"> Exit pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: #0d0d0d;"> Exit page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitles" style="text-decoration:none; color: #0d0d0d;"> Page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: #0d0d0d;"> Site Search Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Pages Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: #0d0d0d;"> Search Keywords with No Results </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Page Titles Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: #0d0d0d;"> Search Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getOutlinks" style="text-decoration:none; color: #0d0d0d;"> Outlinks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getDownloads" style="text-decoration:none; color: #0d0d0d;"> Downloads </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getCategory" style="text-decoration:none; color: #0d0d0d;"> Event Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getAction" style="text-decoration:none; color: #0d0d0d;"> Event Actions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getName" style="text-decoration:none; color: #0d0d0d;"> Event Names </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentNames" style="text-decoration:none; color: #0d0d0d;"> Content Name </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentPieces" style="text-decoration:none; color: #0d0d0d;"> Content Piece </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> Length of Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> Pages per Visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> Visits by Visit Number </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: #0d0d0d;"> Visits by days since last visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitFrequency_get" style="text-decoration:none; color: #0d0d0d;"> Returning Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getReferrerType" style="text-decoration:none; color: #0d0d0d;"> Channel Type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getAll" style="text-decoration:none; color: #0d0d0d;"> All Channels </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getKeywords" style="text-decoration:none; color: #0d0d0d;"> Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: #0d0d0d;"> Search Engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getWebsites" style="text-decoration:none; color: #0d0d0d;"> Websites </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSocials" style="text-decoration:none; color: #0d0d0d;"> Social Networks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getCampaigns" style="text-decoration:none; color: #0d0d0d;"> Campaigns </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get" style="text-decoration:none; color: #0d0d0d;"> Goals </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: #0d0d0d;"> Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: #0d0d0d;"> Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperatures" style="text-decoration:none; color: #0d0d0d;"> Data tables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperaturesEvolution" style="text-decoration:none; color: #0d0d0d;"> Temperatures evolution over time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatios" style="text-decoration:none; color: #0d0d0d;"> Pie graph </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatiosWithLogos" style="text-decoration:none; color: #0d0d0d;"> Advanced tag cloud: with logos and links </a> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html index 6dfb2fb4af..15cac8da1e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -1,4 +1,3 @@ - <html style="background-color:#edecec"> <head> @@ -7,19 +6,19 @@ <meta name="generator" content="Matomo Analytics"> </head> -<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> +<body style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> <a name="reportTop"></a> <table style="width:100%; background-color: #3450A3; color: #fff; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px;padding:0 15px;color: #fff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/"> <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> - <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> + <a style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;; font-size:16px; padding:0 15px; color: #fff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=redirectToCoreHomeIndex&idSite=1&period=day&date=today-date-removed-in-tests"> Dashboard </a> </td> @@ -44,317 +43,317 @@ Report list </h2> <ul> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#MultiSites_getAll" style="text-decoration:none; color: #0d0d0d;"> All Websites dashboard </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitsSummary_get" style="text-decoration:none; color: #0d0d0d;"> Visits Summary </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCountry" style="text-decoration:none; color: #0d0d0d;"> Country </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getContinent" style="text-decoration:none; color: #0d0d0d;"> Continent </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getRegion" style="text-decoration:none; color: #0d0d0d;"> Region </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: #0d0d0d;"> Browser language </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserCountry_getCity" style="text-decoration:none; color: #0d0d0d;"> City </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: #0d0d0d;"> Language code </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getType" style="text-decoration:none; color: #0d0d0d;"> Device type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getModel" style="text-decoration:none; color: #0d0d0d;"> Device model </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: #0d0d0d;"> Device brand </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getResolution" style="text-decoration:none; color: #0d0d0d;"> Screen Resolution </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: #0d0d0d;"> Operating System versions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: #0d0d0d;"> Browsers </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: #0d0d0d;"> Browser version </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Resolution_getConfiguration" style="text-decoration:none; color: #0d0d0d;"> Configurations </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: #0d0d0d;"> Operating System families </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: #0d0d0d;"> Browser engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#DevicePlugins_getPlugin" style="text-decoration:none; color: #0d0d0d;"> Browser Plugins </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: #0d0d0d;"> Visits per local time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: #0d0d0d;"> Visits per server time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> Visits by Day of Week </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#UserId_getUsers" style="text-decoration:none; color: #0d0d0d;"> User IDs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: #0d0d0d;"> Custom Variables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_get" style="text-decoration:none; color: #0d0d0d;"> Actions - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Bandwidth_get" style="text-decoration:none; color: #0d0d0d;"> Bandwidth - Main metrics </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrls" style="text-decoration:none; color: #0d0d0d;"> Page URLs </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: #0d0d0d;"> Entry pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: #0d0d0d;"> Entry page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: #0d0d0d;"> Exit pages </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: #0d0d0d;"> Exit page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitles" style="text-decoration:none; color: #0d0d0d;"> Page titles </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: #0d0d0d;"> Site Search Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Pages Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: #0d0d0d;"> Search Keywords with No Results </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: #0d0d0d;"> Page Titles Following a Site Search </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: #0d0d0d;"> Search Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getOutlinks" style="text-decoration:none; color: #0d0d0d;"> Outlinks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Actions_getDownloads" style="text-decoration:none; color: #0d0d0d;"> Downloads </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getCategory" style="text-decoration:none; color: #0d0d0d;"> Event Categories </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getAction" style="text-decoration:none; color: #0d0d0d;"> Event Actions </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Events_getName" style="text-decoration:none; color: #0d0d0d;"> Event Names </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentNames" style="text-decoration:none; color: #0d0d0d;"> Content Name </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Contents_getContentPieces" style="text-decoration:none; color: #0d0d0d;"> Content Piece </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> Length of Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> Pages per Visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> Visits by Visit Number </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: #0d0d0d;"> Visits by days since last visit </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#VisitFrequency_get" style="text-decoration:none; color: #0d0d0d;"> Returning Visits </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getReferrerType" style="text-decoration:none; color: #0d0d0d;"> Channel Type </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getAll" style="text-decoration:none; color: #0d0d0d;"> All Channels </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getKeywords" style="text-decoration:none; color: #0d0d0d;"> Keywords </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: #0d0d0d;"> Search Engines </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getWebsites" style="text-decoration:none; color: #0d0d0d;"> Websites </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getSocials" style="text-decoration:none; color: #0d0d0d;"> Social Networks </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Referrers_getCampaigns" style="text-decoration:none; color: #0d0d0d;"> Campaigns </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_get" style="text-decoration:none; color: #0d0d0d;"> Goals </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: #0d0d0d;"> Visits to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: #0d0d0d;"> Days to Conversion </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperatures" style="text-decoration:none; color: #0d0d0d;"> Data tables </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getTemperaturesEvolution" style="text-decoration:none; color: #0d0d0d;"> Temperatures evolution over time </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatios" style="text-decoration:none; color: #0d0d0d;"> Pie graph </a> </li> - <li> + <li style="font-size:15px;line-height:24px;"> <a href="#ExampleUI_getPlanetRatiosWithLogos" style="text-decoration:none; color: #0d0d0d;"> Advanced tag cloud: with logos and links </a> diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png index a7ad67309a..12f82f652c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_optout_iframe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14bf2aefb01595235574b7f1e9118e05ebd310fb4b7b593c1a89aa76da241c4f -size 24143 +oid sha256:ad95a9e2a316e6ca72143e82ce5c65c3a4695f01427d1e1263379322ce0cb947 +size 25985 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 7b13c7f76c..43eba2cc19 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:7666dc5e632377764535da9fd8d2cf8b4f8f8f3709c07b3fe7c66f7e9d5954f3 -size 1598764 +oid sha256:c37fcfbdf326ebcc16729b022aca6ce431992b65d41c8e5bdbe59fcc61ac84fd +size 1598942 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 42402fb9ef..6eddb9edf2 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:c4231cc0842c4d45a8cafc7a90c83f3968006600aae7087c1ff1bd8f35a851ca -size 707698 +oid sha256:ed0cc66e3683214a34ff2e27346d1351e748792149ddcf42f8241cad78805d02 +size 707560 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index 6acb9d2565..2235c4d8d3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b641aacf52b9d8550dd7827b8febcf565754f2c7a635ba32e030a8173306fbdf -size 86600 +oid sha256:e7a96e1a04e8c429ff4d5065322dd27f9963a4bf0a8e992a27aacb18415dabcf +size 86664 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index debbc36c88..a46983301a 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:07091d8930a06f21646e28f4b4eabb16fdc743ad23c1edde0495615aa6ea2e67 -size 112441 +oid sha256:8f49f00003da7d2a94ce181a1b0724dcd336f989152798ca3c367b921cf6cf39 +size 112446 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 1a9fc2dd45..aca4825e48 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ffa8cf94fef25c6947dc58011da332850941ec6c921816901b08b74591f70a7 -size 159194 +oid sha256:ab380ddc03a90f74e0cbcb5ad048c6588fcc3ec67c0983ae56238033af6edc80 +size 159147 |
