From 5b7c98f1ed6a621545ceb7f5d1aa15f4de075d24 Mon Sep 17 00:00:00 2001 From: alvitazwar <55917380+alvitazwar@users.noreply.github.com> Date: Thu, 8 Sep 2022 00:12:30 +0600 Subject: [PATCH 01/10] Add Full Screen Test case --- .../editor/various/fullscreen-mode.spec.js | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 test/e2e/specs/editor/various/fullscreen-mode.spec.js diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js new file mode 100644 index 00000000000000..fcb5cbcf58067b --- /dev/null +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -0,0 +1,42 @@ +/** + * WordPress dependencies + */ +const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' ); + +test.describe( 'Full Screen', () => { + test.beforeEach( async ( { admin } ) => { + await admin.createNewPost(); + } ); + + test.afterEach( async ( { requestUtils } ) => { + await requestUtils.deleteAllPosts(); + } ); + + test( 'should open the fullscreen mode from the more menu', async ( { + page, + } ) => { + // Open Options + await page.locator( ' [aria-label="Options"]' ).click(); + + // Verify All options are visible + page.locator( '.interface-more-menu-dropdown__content' ); + + // Choose Full Screen Mode + await page + .locator( 'text=Fullscreen modeWork without distraction⇧⌥⌘F' ) + .click(); + + // Validate Fullscreen + const isFullscreenEnabled = await page.$eval( 'body', ( body ) => { + return body.classList.contains( 'is-fullscreen-mode' ); + } ); + + expect( isFullscreenEnabled ).toBe( true ); + + const fullscreenCloseButton = await page.locator( + '.edit-post-fullscreen-mode-close' + ); + + expect( fullscreenCloseButton ).not.toBeNull(); + } ); +} ); From f62d2601f2d7a9cd474db96be773a948edbc968b Mon Sep 17 00:00:00 2001 From: alvitazwar <55917380+alvitazwar@users.noreply.github.com> Date: Thu, 8 Sep 2022 13:47:03 +0600 Subject: [PATCH 02/10] Remove old migrated file --- .../editor/various/fullscreen-mode.test.js | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 packages/e2e-tests/specs/editor/various/fullscreen-mode.test.js diff --git a/packages/e2e-tests/specs/editor/various/fullscreen-mode.test.js b/packages/e2e-tests/specs/editor/various/fullscreen-mode.test.js deleted file mode 100644 index 2d925e56a204a0..00000000000000 --- a/packages/e2e-tests/specs/editor/various/fullscreen-mode.test.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * WordPress dependencies - */ -import { - createNewPost, - clickOnMoreMenuItem, - toggleMoreMenu, -} from '@wordpress/e2e-test-utils'; - -describe( 'Fullscreen Mode', () => { - beforeAll( async () => { - await createNewPost(); - } ); - - it( 'should open the fullscreen mode from the more menu', async () => { - await clickOnMoreMenuItem( 'Fullscreen mode' ); - await toggleMoreMenu( 'close' ); - - const isFullscreenEnabled = await page.$eval( 'body', ( body ) => { - return body.classList.contains( 'is-fullscreen-mode' ); - } ); - - expect( isFullscreenEnabled ).toBe( true ); - - const fullscreenCloseButton = await page.$( - '.edit-post-fullscreen-mode-close' - ); - - expect( fullscreenCloseButton ).not.toBeNull(); - } ); -} ); From 1183599508addfa9b42c7adfc1a3d2e64a2fdb2f Mon Sep 17 00:00:00 2001 From: alvitazwar <55917380+alvitazwar@users.noreply.github.com> Date: Thu, 8 Sep 2022 18:46:00 +0600 Subject: [PATCH 03/10] Modify Locator --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index fcb5cbcf58067b..ddd56f8b3da11f 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -23,7 +23,7 @@ test.describe( 'Full Screen', () => { // Choose Full Screen Mode await page - .locator( 'text=Fullscreen modeWork without distraction⇧⌥⌘F' ) + .locator( 'text=/Fullscreen modeWork without distraction/' ) .click(); // Validate Fullscreen From 49fccbb9f90fc861cff9d354f11a67f0f7b884dd Mon Sep 17 00:00:00 2001 From: Alvi Tazwar <55917380+alvitazwar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:00:18 +0600 Subject: [PATCH 04/10] Update test/e2e/specs/editor/various/fullscreen-mode.spec.js Co-authored-by: George Mamadashvili --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index ddd56f8b3da11f..8a44db8b605c48 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -3,7 +3,7 @@ */ const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' ); -test.describe( 'Full Screen', () => { +test.describe( 'Fullscreen Mode', () => { test.beforeEach( async ( { admin } ) => { await admin.createNewPost(); } ); From fb1f8d2c8692a9593287b90cd167e5adf42703d6 Mon Sep 17 00:00:00 2001 From: Alvi Tazwar <55917380+alvitazwar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:00:31 +0600 Subject: [PATCH 05/10] Update test/e2e/specs/editor/various/fullscreen-mode.spec.js Co-authored-by: George Mamadashvili --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index 8a44db8b605c48..f6de1696643b84 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -16,7 +16,9 @@ test.describe( 'Fullscreen Mode', () => { page, } ) => { // Open Options - await page.locator( ' [aria-label="Options"]' ).click(); + await page.click( + 'role=region[name="Editor top bar"i] >> role=button[name="Options"i]' + ); // Verify All options are visible page.locator( '.interface-more-menu-dropdown__content' ); From 7f6dff6a6820b62441dc379ef0cf8005d1a81a2c Mon Sep 17 00:00:00 2001 From: Alvi Tazwar <55917380+alvitazwar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:00:42 +0600 Subject: [PATCH 06/10] Update test/e2e/specs/editor/various/fullscreen-mode.spec.js Co-authored-by: George Mamadashvili --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index f6de1696643b84..2e4a523c6f479e 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -20,8 +20,6 @@ test.describe( 'Fullscreen Mode', () => { 'role=region[name="Editor top bar"i] >> role=button[name="Options"i]' ); - // Verify All options are visible - page.locator( '.interface-more-menu-dropdown__content' ); // Choose Full Screen Mode await page From 3e0af2e4bb47af859e94e34b5d81e595c0beb889 Mon Sep 17 00:00:00 2001 From: Alvi Tazwar <55917380+alvitazwar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:00:50 +0600 Subject: [PATCH 07/10] Update test/e2e/specs/editor/various/fullscreen-mode.spec.js Co-authored-by: George Mamadashvili --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index 2e4a523c6f479e..38904f32ef0e08 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -23,7 +23,7 @@ test.describe( 'Fullscreen Mode', () => { // Choose Full Screen Mode await page - .locator( 'text=/Fullscreen modeWork without distraction/' ) + .locator( 'role=menuitemcheckbox', { hasText: 'Fullscreen mode' } ) .click(); // Validate Fullscreen From 85e326f4a6ad6af465cd67795e7a3449ee75595a Mon Sep 17 00:00:00 2001 From: Alvi Tazwar <55917380+alvitazwar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:01:08 +0600 Subject: [PATCH 08/10] Update test/e2e/specs/editor/various/fullscreen-mode.spec.js Co-authored-by: George Mamadashvili --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index 38904f32ef0e08..375bc9d5c6cfed 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -26,12 +26,10 @@ test.describe( 'Fullscreen Mode', () => { .locator( 'role=menuitemcheckbox', { hasText: 'Fullscreen mode' } ) .click(); - // Validate Fullscreen - const isFullscreenEnabled = await page.$eval( 'body', ( body ) => { - return body.classList.contains( 'is-fullscreen-mode' ); - } ); - - expect( isFullscreenEnabled ).toBe( true ); + // Check the body class. + await expect( page.locator( 'body' ) ).toHaveClass( + /is-fullscreen-mode/ + ); const fullscreenCloseButton = await page.locator( '.edit-post-fullscreen-mode-close' From 2b8527bc6be76cdc18c282b6bcf1a7f922619068 Mon Sep 17 00:00:00 2001 From: Alvi Tazwar <55917380+alvitazwar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:01:20 +0600 Subject: [PATCH 09/10] Update test/e2e/specs/editor/various/fullscreen-mode.spec.js Co-authored-by: George Mamadashvili --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index 375bc9d5c6cfed..c69e84e566dfd1 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -31,10 +31,10 @@ test.describe( 'Fullscreen Mode', () => { /is-fullscreen-mode/ ); - const fullscreenCloseButton = await page.locator( - '.edit-post-fullscreen-mode-close' - ); - - expect( fullscreenCloseButton ).not.toBeNull(); + await expect( + page.locator( + 'role=region[name="Editor top bar"i] >> role=link[name="View Posts"i]' + ) + ).toBeVisible(); } ); } ); From 1cdbe157cfa1eaad1bbc9e1f8663f863be6008a8 Mon Sep 17 00:00:00 2001 From: alvitazwar <55917380+alvitazwar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:41:03 +0600 Subject: [PATCH 10/10] Addressed Feedback --- test/e2e/specs/editor/various/fullscreen-mode.spec.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/specs/editor/various/fullscreen-mode.spec.js b/test/e2e/specs/editor/various/fullscreen-mode.spec.js index c69e84e566dfd1..8b7a0785a7ed6d 100644 --- a/test/e2e/specs/editor/various/fullscreen-mode.spec.js +++ b/test/e2e/specs/editor/various/fullscreen-mode.spec.js @@ -15,13 +15,12 @@ test.describe( 'Fullscreen Mode', () => { test( 'should open the fullscreen mode from the more menu', async ( { page, } ) => { - // Open Options + // Open Options Menu await page.click( 'role=region[name="Editor top bar"i] >> role=button[name="Options"i]' ); - - // Choose Full Screen Mode + // Select Full Screen Mode await page .locator( 'role=menuitemcheckbox', { hasText: 'Fullscreen mode' } ) .click();