Skip to content

Commit f99ea91

Browse files
authored
Make resetting of the viewport to fullpage optional for page.screenshotSelector (#24410)
* adding option to not resize the viewport for screenshotSelector so that we can set some viewport height if we want to - making changes to menu spec to see that viewport height changes * update screenshot
1 parent 87765ea commit f99ea91

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

Lines changed: 2 additions & 2 deletions
Loading

tests/UI/specs/Menus_spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe("Menus", function () {
9393
});
9494

9595
it('should load the admin left menu correctly on mobile', async function() {
96-
await page.webpage.setViewport({ width: 815, height: 1500 });
96+
await page.webpage.setViewport({ width: 815, height: 1600 });
9797
await page.goto("?module=CoreAdminHome&action=home");
9898
await page.waitForNetworkIdle();
9999
await page.click('[data-target="mobile-left-menu"]');
@@ -106,7 +106,7 @@ describe("Menus", function () {
106106
await page.click('ul#mobile-left-menu > li:nth-child(6) a');
107107
await page.waitForTimeout(500);
108108

109-
expect(await page.screenshotSelector('#mobile-left-menu')).to.matchImage('mobile_left_admin');
109+
expect(await page.screenshotSelector('#mobile-left-menu', false)).to.matchImage('mobile_left_admin');
110110
});
111111

112112
it('should load the admin top menu correctly on mobile', async function() {
@@ -122,7 +122,7 @@ describe("Menus", function () {
122122
});
123123

124124
it('should load the left reporting menu correctly on mobile', async function() {
125-
await page.webpage.setViewport({ width: 768, height: 1200 });
125+
await page.webpage.setViewport({ width: 768, height: 1000 });
126126
await page.goto("?" + generalParams + "&module=CoreHome&action=index#?category=General_Visitors&subcategory=General_Overview");
127127
await page.waitForNetworkIdle();
128128
await page.evaluate(function(){
@@ -132,6 +132,6 @@ describe("Menus", function () {
132132
await (await page.jQuery('#mobile-left-menu>li>ul:contains(Goals)')).click();
133133
await page.waitForTimeout(500);
134134

135-
expect(await page.screenshotSelector('#mobile-left-menu')).to.matchImage('mobile_left');
135+
expect(await page.screenshotSelector('#mobile-left-menu', false)).to.matchImage('mobile_left');
136136
});
137137
});

tests/lib/screenshot-testing/support/page-renderer.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,12 @@ PageRenderer.prototype.resizeViewportToFullPage = async function () {
197197
await this.webpage.setViewport(JSON.parse(dims));
198198
};
199199

200-
PageRenderer.prototype.screenshotSelector = async function (selector) {
200+
PageRenderer.prototype.screenshotSelector = async function (selector, shouldResizeViewport = true) {
201201
await this.waitForFunction(() => !! window.$, { timeout: 60000 });
202202

203-
await this.resizeViewportToFullPage();
203+
if (shouldResizeViewport) {
204+
await this.resizeViewportToFullPage();
205+
}
204206

205207
const result = await this.webpage.evaluate(function (selector) {
206208
window.jQuery('html').addClass('uiTest');

0 commit comments

Comments
 (0)