Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordizzy <diosmosis@users.noreply.github.com>2021-11-05 08:39:33 +0300
committerGitHub <noreply@github.com>2021-11-05 08:39:33 +0300
commit2b94200db7e08389466859377c1b4732207673a2 (patch)
treee2f8ed241b13b1792e4f7e18d80622c77859dea8 /plugins/SitesManager
parent0917a39fc686ac2d5e349b3bcc5266598ce59ee7 (diff)
[Vue] migrate comparisons service + component (#18193)
* migrating RateFeature and ReviewLinks + adding AjaxHelper.fetch utility method (all untested) * get ratefeature component to work, modify matomodialog component to use v-model, add event parameters to createAngularAdapter, allow translate to use variadic args or one string array + rebuild * remove ratefeature angularjs files * rebuild + make vue mapping property optional in createANgularJsAdapter * migrate enrichedheadline and get to work * fix test * fix translate * fix another translate issue & migrate contentblock directive * fix anchor links, not including the "/" causes angularjs to fail (also on 4.x-dev) * update expected screenshots * fix ui test * fix some test failures * fix nested transclude issue * remove content block files * fix icon spacing that occurs due to angularjs inserting empty comments in between nodes while vue 3 does not * update some screenshots * update screenshot (actually fixes an alignment issue) * update screenshot * first pass at converting comparisons service/component * get new code to build and load without error in the UI * debugging * getting basic functionaltiy to work * fix UI test failure + URL encoding/angularjs issue causing back button to not work * using ref in setup() is not needed to access this.$refs * Convert comparisons service angularjs tests to comparison store typescript tests. * built vue files * rewrite URL handling to use computed properties in a URL store + do the same for other dependent data in the comparison store to allow vues to subscribe to the properties for changes to global state * fix some tests * some more fixes * more fixes + disallow modifications to MatomoUrl state * get angularjs unit tests to pass + fix a couple more issues * another fix * fix bad merge * self review + fixes * remove old fix as it may not be needed anymore * empty string is not a valid date + do not report invalid date exception just rethrow * update screenshots and try to fix random failure * use jquery $destroy event instead of scope one since the scope one is broadcasted * update expected screenshot
Diffstat (limited to 'plugins/SitesManager')
-rw-r--r--plugins/SitesManager/tests/UI/SitesManager_spec.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/SitesManager/tests/UI/SitesManager_spec.js b/plugins/SitesManager/tests/UI/SitesManager_spec.js
index af28b3cbfb..da2c0c211c 100644
--- a/plugins/SitesManager/tests/UI/SitesManager_spec.js
+++ b/plugins/SitesManager/tests/UI/SitesManager_spec.js
@@ -17,7 +17,8 @@ describe("SitesManager", function () {
{
await test();
await page.waitForNetworkIdle();
- pageWrap = await page.$('#content');
+ const pageWrap = await page.$('#content');
+ await page.waitFor(() => !!$('.enrichedHeadline:contains("Manage Measurables")').length);
expect(await pageWrap.screenshot()).to.matchImage(screenshotName);
}