From afeda46478baf9fec2faa70547b7bc988e83b400 Mon Sep 17 00:00:00 2001 From: Altamash Shaikh Date: Wed, 20 Mar 2024 07:37:38 +0530 Subject: [PATCH 1/2] Added code to remove All websites from site selector dropdwon, #PG-3196 --- templates/manageContainers.twig | 1 + templates/tagmanager.twig | 1 + tests/UI/Container_spec.js | 7 +++++++ tests/UI/TagManager_spec.js | 7 +++++++ .../Container_websites_dropdown_without_all_websites.png | 3 +++ .../TagManager_websites_dropdown_without_all_websites.png | 3 +++ 6 files changed, 22 insertions(+) create mode 100644 tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png create mode 100644 tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png diff --git a/templates/manageContainers.twig b/templates/manageContainers.twig index 4022af96..2dc47d9f 100644 --- a/templates/manageContainers.twig +++ b/templates/manageContainers.twig @@ -8,6 +8,7 @@
diff --git a/templates/tagmanager.twig b/templates/tagmanager.twig index 6ca5cd5c..c2dfc677 100644 --- a/templates/tagmanager.twig +++ b/templates/tagmanager.twig @@ -26,6 +26,7 @@
diff --git a/tests/UI/Container_spec.js b/tests/UI/Container_spec.js index 640e494a..0de62752 100644 --- a/tests/UI/Container_spec.js +++ b/tests/UI/Container_spec.js @@ -58,6 +58,13 @@ describe("Container", function () { expect(await pageWrap.screenshot()).to.matchImage('site_some_exist'); }); + it('should show websites dropdown without all websites', async function () { + await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click()); + pageWrap = await page.$('.top_bar_sites_selector .dropdown'); + expect(await pageWrap.screenshot()).to.matchImage('websites_dropdown_without_all_websites'); + await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click()); + }); + it('should be able to create a new container', async function () { await page.click('.createNewContainer'); await capture.setTableRowHeight(page); diff --git a/tests/UI/TagManager_spec.js b/tests/UI/TagManager_spec.js index e14c7606..a7575289 100644 --- a/tests/UI/TagManager_spec.js +++ b/tests/UI/TagManager_spec.js @@ -51,6 +51,13 @@ describe("TagManager", function () { await capture.page(page, 'getting_started'); }); + it('should show websites dropdown without all websites', async function () { + await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click()); + pageWrap = await page.$('.top_bar_sites_selector .dropdown'); + expect(await pageWrap.screenshot()).to.matchImage('websites_dropdown_without_all_websites'); + await page.evaluate(() => $('.top_bar_sites_selector .siteSelector a.title').click()); + }); + it('should show top bar list when no container exists', async function () { await page.goto(generalParamsSite5 + urlBase + 'gettingStarted'); await capture.topControls(page, 'top_controls_no_container_exists'); diff --git a/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png b/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png new file mode 100644 index 00000000..d3966bdf --- /dev/null +++ b/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c69491ef5fef2db386f3cab531443a1e6a30794d101a448b66dcc0e34f286d07 +size 2967 diff --git a/tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png b/tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png new file mode 100644 index 00000000..11a86146 --- /dev/null +++ b/tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acf16c46ff292ce14f65877c92532a41a427e9ba019cddedf3490e15f31a292e +size 2971 From 387a07dc28c262994bd4bbc0d21df5225846c7a1 Mon Sep 17 00:00:00 2001 From: Altamash Shaikh Date: Wed, 20 Mar 2024 07:59:44 +0530 Subject: [PATCH 2/2] Updated UI screenshots --- .../Container_websites_dropdown_without_all_websites.png | 4 ++-- .../TagManager_websites_dropdown_without_all_websites.png | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png b/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png index d3966bdf..66b09157 100644 --- a/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png +++ b/tests/UI/expected-screenshots/Container_websites_dropdown_without_all_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c69491ef5fef2db386f3cab531443a1e6a30794d101a448b66dcc0e34f286d07 -size 2967 +oid sha256:df59fa99eb94b0f7298f75bbcdda44f0855e80e6ff193218a2942d8af00933be +size 2980 diff --git a/tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png b/tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png index 11a86146..73891dbd 100644 --- a/tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png +++ b/tests/UI/expected-screenshots/TagManager_websites_dropdown_without_all_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acf16c46ff292ce14f65877c92532a41a427e9ba019cddedf3490e15f31a292e -size 2971 +oid sha256:e711371236d3dfbfbd63c6a086eba8fc27805d82964091994d24f41bab4d88ba +size 2980