diff options
25 files changed, 44 insertions, 40 deletions
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject a01244c8d9c12013024640399240fbe1d93234d +Subproject 8ed4d2eb00ed1da45ce2a66cb8d6563112f2cbf diff --git a/plugins/Dashboard/tests/UI/Dashboard_spec.js b/plugins/Dashboard/tests/UI/Dashboard_spec.js index 3459da362d..4075fb7af2 100644 --- a/plugins/Dashboard/tests/UI/Dashboard_spec.js +++ b/plugins/Dashboard/tests/UI/Dashboard_spec.js @@ -190,6 +190,7 @@ describe("Dashboard", function () { await page.click('.dashboard-manager .title'); await page.click('li[data-action="renameDashboard"]'); await page.evaluate(() => $('#newDashboardName').val('newname')); + await page.waitFor(250); var button = await page.jQuery('.modal.open .modal-footer a:contains(Save)'); await button.click(); await page.mouse.move(-10, -10); diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png index c0429584d7..f300c161bd 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03a4cb2baeafcf12b51121737f80187f3a26dafb5bc4cc3df946c4c8f975d80f -size 247542 +oid sha256:698462a4ebbe4a612a7554a9053a835bb4d871a65cf0a3806aef3e749a32d495 +size 285612 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png index 6528a0e820..6b720a974b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:280941c92001b94febadf9b867083f0000b91a34a24645f136c83b6f46b6f55f -size 29841 +oid sha256:0ba11a04fa17bf4c2b7d5ca9563ee1eeb5231d01c0b33d274ba9e9d96718c96b +size 29085 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 15926547b7..4f94f4e039 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:9486c79eed6489a34342211671250c58a7237b70d157f7c433c5efa484386bdc -size 690933 +oid sha256:d0fbc088b6be3b8a0b820a6fafca33780e8883bd7c34a26d398252d847c48c72 +size 690912 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index 15926547b7..4f94f4e039 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9486c79eed6489a34342211671250c58a7237b70d157f7c433c5efa484386bdc -size 690933 +oid sha256:d0fbc088b6be3b8a0b820a6fafca33780e8883bd7c34a26d398252d847c48c72 +size 690912 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png index e02031f56f..5f448c0fb7 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:001d248175369f3c5bbbcd5fa19d5dc66ede98956cebf56a4315869734198aee -size 241560 +oid sha256:da5c36a65726d8f927c4305c2cd1be15841f4b319ad7cc10fcb7edcdd8d6269f +size 281150 diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png index da7f861dbb..666794718e 100644 --- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png +++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1c6815ca1419adec5cc2c57e24c9bf8dcf2f152d5aae178d31234145f02d64f -size 250999 +oid sha256:4bceac4916d5087af8c71210320e71adc42d5eb22e40b9b5b1c2e2c37a722bfe +size 251453 diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject 06a88748649286e7fbe6f092ac676cf7fa8f0bf +Subproject c28a7535a98cf4073af30e39fe6537ab4b63536 diff --git a/tests/PHPUnit/Integration/FrontControllerTest.php b/tests/PHPUnit/Integration/FrontControllerTest.php index 89c426136a..77513b4180 100644 --- a/tests/PHPUnit/Integration/FrontControllerTest.php +++ b/tests/PHPUnit/Integration/FrontControllerTest.php @@ -13,6 +13,7 @@ use Piwik\Auth; use Piwik\Container\StaticContainer; use Piwik\FrontController; use Piwik\Http; +use Piwik\Session; use Piwik\Session\SessionFingerprint; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; @@ -64,6 +65,8 @@ FORMAT; */ public function test_authImplementationConfigured_EvenIfSessionAuthSucceeds() { + Session::start(); + Access::getInstance()->setSuperUserAccess(false); $sessionFingerprint = new SessionFingerprint(); diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index 73e307aefe..5b0e7142f2 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -583,7 +583,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase // Don't run the test on local dev machine, as we may have other files (not in GIT) that would fail this test $this->markTestSkipped("Skipped this test on local dev environment."); } - $maximumTotalFilesizesExpectedInMb = 51; + $maximumTotalFilesizesExpectedInMb = 54; $minimumTotalFilesizesExpectedInMb = 38; $minimumExpectedFilesCount = 7000; diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index edca2dec31..21e43d06ba 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -49,7 +49,7 @@ class WidgetsListTest extends IntegrationTestCase 'Insights_WidgetCategory' => 2, 'ExampleUI_UiFramework' => 8, 'Referrers_Referrers' => 10, - 'About Matomo' => 11, + 'About Matomo' => 12, ); // number of main categories $this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory)); diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png index 309c97c192..63e9a1c252 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d802d9331ef97864ba98cc70c1dc7699c251d97a8d66e058f340db23daadc50 -size 247228 +oid sha256:3e33a5a15445f33fd5a7b7dc5c4751ba102a6c87aa119ddf4f055d833cf891d9 +size 271297 diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index f9d3b756a0..9318f999c3 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:743423a78da97f7b86a56734861e80825780aa503b8b9646bec69a1a0bd33d18 -size 367067 +oid sha256:bdb64def654b03acdd330ba2220c5ea4fba9af52cbe78a9d9f2b32a7bbc9bd83 +size 366998 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 7355f47659..a3e90b55f4 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea7056e94421aa1383e5ed12c82b63dd6d933859750ce3f5aadb9f527a78b07 -size 697753 +oid sha256:0ff9023a284124c121911b1adbef1ecce2a3ebb8c33c641efe9e618adc2e03bf +size 697788 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index b579c90159..91fbaaad63 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:656c048539835893783cb16f649cd45935a146b437f21c9033d943a5d3c27086 -size 4275502 +oid sha256:09bf1c1fea131570d4fb0181f3fdafd4b9cbd9b695416d78555510cc6c5c44a2 +size 4290634 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 905c0c2aea..4e1b593dc9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b2dcd3101d286afbade8aa12c495708c6e81432e189a1d3be07de13743b79d5 -size 141435 +oid sha256:646e96c94263d4fcec007e0969a519e93a2e2a3a9728170beff22dc4f61acd59 +size 141510 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png index 50a8b6050f..225b348790 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c630ad2c7a780764fde9aa200edb08661d89a1d4593f0ded7066a01f1f1c7c2c -size 439048 +oid sha256:a30b32a04b803dddba1917a8e2d4d6a96f2d9541d9a95b51e1a9cfa10de77c28 +size 439965 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 666886997c..a8832f46d7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:146c6d84a9d5789668220c03f10e4b4286f17546e633c22b0212886a53b6cb1a -size 1056708 +oid sha256:cf5ab349ae3838efeccc95c3dfaad4ca0b1c02f8ef2d92d93170092689043a9a +size 1068295 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index 9f3f4cd44d..d9d0fc0a7e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:329c76a4ec793cd873cb1a333258ba60493438c60682bfe56679931723439189 -size 1057195 +oid sha256:da13fb93474b77d9199c5b134fa097230f8ad6a6d55972bfd14872854b1b52ca +size 1069745 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png index 905c0c2aea..4e1b593dc9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b2dcd3101d286afbade8aa12c495708c6e81432e189a1d3be07de13743b79d5 -size 141435 +oid sha256:646e96c94263d4fcec007e0969a519e93a2e2a3a9728170beff22dc4f61acd59 +size 141510 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index 1e6dffa41b..cf30fd0907 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e20d5e128231c2f63ac83fa36a45c7c8b9c786d6a29b25214fc84b8fd7a7e40 -size 4892723 +oid sha256:c0bbc7d810f23e0f735fd33dca15b2a4eab8c7d238fd15c7a4cda3f612ead234 +size 4917596 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index cfae65ab42..00e878b918 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:868f664f3fbeb8c9e065ba89b8ed01526d54d477bdffc5e49b780a788971dbe1 -size 626106 +oid sha256:0dfbe64f3a5f5bd1d5e16f3d663fc3b693436fb7972c606787a834ae9a96cc73 +size 626137 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 7ab4114db8..64c6b2acf4 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:cfcf7f4ffa9af0512e8935a5671572b1566550d670c1de8b2b0c97042586aae8 -size 727133 +oid sha256:dd5b0ff99d68008e270375f352e2bde22519117662da009966e5806bfb7b10cf +size 750821 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png index 8a24cc845f..676a7c9887 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb1912badb248c67a603e86e19bfb483651a96e080154d3c86ee300ee0c6e4fe -size 266704 +oid sha256:a740f524c87e5ff02908c9e07c663a78f0a3db1c7ab01cb92d0407a838ba663a +size 282829 |
