Fixes a couple of regressions & tests #17358
Conversation
sgiehl
added
not-in-changelog
| return; | ||
| var deferred = $q.defer(); | ||
| deferred.resolve(); | ||
| return deferred.promise; |
There was a problem hiding this comment.
Without that change the site selector when creating a new user didn't work. UI tests for that were actually failing...
| @@ -41,7 +41,7 @@ | |||
|
|
|||
| var params = { 'text': text, 'url': url}; | |||
| var paramString = ''; | |||
| for (const param in params) { | |||
| for (var param in params) { | |||
There was a problem hiding this comment.
angularjs tests were failing because of this const usages...
| @@ -47,7 +47,7 @@ | |||
| "ReferBannerTitle": "Don't let your friend's data end up in the wrong hands!", | |||
| "ReferBannerLonger": "Refer them to Matomo Analytics now to take back control!", | |||
| "ReferBannerEmailShareSubject": "Refer them to Matomo Analytics now to take back control!", | |||
| "ReferBannerEmailShareBody": "I choose Matomo, an ethical alternative to Google Analytics that gives me 100% data ownership and protects the data of my website visitors.\r\nI’m sharing this message in the hope that you too will take back the power from Google and get complete ownership of your own data.\r\n\r\nCheck out Matomo at https://matomo.org", | |||
| "ReferBannerEmailShareBody": "I choose Matomo, an ethical alternative to Google Analytics that gives me 100%% data ownership and protects the data of my website visitors.\r\nI’m sharing this message in the hope that you too will take back the power from Google and get complete ownership of your own data.\r\n\r\nCheck out Matomo at https://matomo.org", | |||
There was a problem hiding this comment.
A simple % in translations needs to be escaped with another %. There was actually also one test failing because of this.
| $this->userModel->deleteUserOnly('user1'); | ||
| } catch (\Exception $e) { | ||
| // ignore possible errors triggered when the delete user event is posted | ||
| } |
There was a problem hiding this comment.
One test didn't work on travis. The deleteUserOnly method fire a event, which fails somewhere when no user is logged in. As it's not relevant in this case, it can be simply ignored.
| @@ -26,6 +26,7 @@ describe("SiteSelector", function () { | |||
|
|
|||
| await page.waitForSelector('.custom_select_ul_list'); | |||
| await page.waitForNetworkIdle(); | |||
| await page.click('.websiteSearch'); | |||
There was a problem hiding this comment.
The focused element was changing randomly. This should ensure it's always the same, so the tests won't fail randomly anymore.
|
Will merge this now. and maybe check some of the other failing tests tomorrow if I have some time |
Description:
Review