From 4fc054b0219d4c1c35c47616536488d6ff10d0dd Mon Sep 17 00:00:00 2001 From: diosmosis Date: Sun, 6 Jan 2019 16:52:42 -0800 Subject: Update submodules. (#13936) * Update submodules. * Update expected files. * Fix more integration tests. * Update submodule. * Update screenshots. --- ...est_ArchiveCronTest_archive_php_cron_output.txt | 2 +- .../tests/Integration/UpdateCommunicationTest.php | 40 +++--- plugins/CustomAlerts | 2 +- .../Dashboard_loaded_token_auth.png | 4 +- ...eduledReports.generateReport_week.original.html | 7 +- ...eduledReports.generateReport_week.original.html | 7 +- ...eduledReports.generateReport_week.original.html | 7 +- ...eduledReports.generateReport_week.original.html | 157 ++++++++++----------- ...eduledReports.generateReport_week.original.html | 157 ++++++++++----------- .../tests/Integration/PasswordResetterTest.php | 4 +- .../tests/Integration/UpdateCommunicationTest.php | 27 ++-- ...vacyManager_gdpr_tools_enrich_segment_by_ip.png | 4 +- plugins/QueuedTracking | 2 +- .../AttachedFileReportEmailGeneratorTest.php | 6 +- .../tests/Integration/ReportEmailGeneratorTest.php | 2 +- .../TwoFactorAuth_logme_verified.png | 4 +- ...duledReports.generateReport_month.original.html | 7 +- ...duledReports.generateReport_month.original.html | 7 +- ...duledReports.generateReport_month.original.html | 7 +- ...duledReports.generateReport_month.original.html | 133 +++++++++-------- ...duledReports.generateReport_month.original.html | 133 +++++++++-------- ...IntegrationTest_admin_privacy_optout_iframe.png | 4 +- .../UIIntegrationTest_dashboard2.png | 4 +- .../UIIntegrationTest_dashboard3.png | 4 +- .../UIIntegrationTest_visitors_devices.png | 4 +- .../UIIntegrationTest_visitors_realtime_map.png | 4 +- .../UIIntegrationTest_visitors_software.png | 4 +- 27 files changed, 376 insertions(+), 367 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 = "

ScheduledReports_EmailHello

-CoreUpdater_ThereIsNewVersionAvailableForUpdate +

CoreUpdater_ThereIsNewVersionAvailableForUpdate

-CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage +

CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage
{$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable +

-CoreUpdater_ViewVersionChangelog -https://matomo.org/changelog/matomo-33-0-0/ +

+ CoreUpdater_ViewVersionChangelog +
+ https://matomo.org/changelog/matomo-33-0-0/ +

-CoreUpdater_ReceiveEmailBecauseIsSuperUser - -CoreUpdater_FeedbackRequest -https://matomo.org/contact/"; +

CoreUpdater_ReceiveEmailBecauseIsSuperUser

+

CoreUpdater_FeedbackRequest
https://matomo.org/contact/

+"; $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 = "

ScheduledReports_EmailHello

-CoreUpdater_ThereIsNewVersionAvailableForUpdate +

CoreUpdater_ThereIsNewVersionAvailableForUpdate

-CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage +

CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage
{$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable +

-CoreUpdater_ReceiveEmailBecauseIsSuperUser -CoreUpdater_FeedbackRequest -https://matomo.org/contact/"; +

CoreUpdater_ReceiveEmailBecauseIsSuperUser

+

CoreUpdater_FeedbackRequest
https://matomo.org/contact/

+"; $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 index 94e00f49db..2cca6e6b2f 160000 --- a/plugins/CustomAlerts +++ b/plugins/CustomAlerts @@ -1 +1 @@ -Subproject commit 94e00f49db0c832b03653d8f993ea14a89694fcf +Subproject commit 2cca6e6b2f34e825f5d0fbe95f41879b39e55a08 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 @@ - @@ -7,19 +6,19 @@ - + 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 @@ - @@ -7,19 +6,19 @@ - +
- + Matomo, free/libre analytics platform - + Dashboard
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 @@ - @@ -7,19 +6,19 @@ - +
- + Matomo, free/libre analytics platform - + Dashboard
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 @@ - @@ -7,19 +6,19 @@ - +
- + Matomo, free/libre analytics platform - + Dashboard
@@ -44,377 +43,377 @@ Report list
- + Matomo, free/libre analytics platform - + Dashboard
@@ -44,377 +43,377 @@ Report list
- + Matomo, free/libre analytics platform - + Dashboard
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 @@ - @@ -7,19 +6,19 @@ - +
- + Matomo, free/libre analytics platform - + Dashboard
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 @@ - @@ -7,19 +6,19 @@ - +
- + Matomo, free/libre analytics platform - + Dashboard
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 @@ - @@ -7,19 +6,19 @@ - +
- + Matomo, free/libre analytics platform - + Dashboard
@@ -44,317 +43,317 @@ Report list
- + Matomo, free/libre analytics platform - + Dashboard
@@ -44,317 +43,317 @@ Report list
- + Matomo, free/libre analytics platform - + Dashboard