Tests: Use explicit setViewport calls

WordPress · Jul 31, 2018 · 78825c0 · 78825c0
1 parent 69126e1
commit 78825c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/test/e2e/specs/sidebar-behaviour.test.js b/test/e2e/specs/sidebar-behaviour.test.js
@@ -11,7 +11,6 @@ describe( 'Publishing', () => {
 	afterEach( async () => {
 		await clearLocalStorage();
 		await page.goto( 'about:blank' );
-		await setViewport( 'large' );
 	} );
 
 	it( 'Should have sidebar visible at the start with document sidebar active on desktop', async () => {
@@ -40,7 +39,7 @@ describe( 'Publishing', () => {
 
 	it( 'Should have the sidebar closed by default on mobile', async () => {
 		await setViewport( 'small' );
-		await newPost( { viewport: 'small' } );
+		await newPost();
 		const sidebar = await page.$( SIDEBAR_SELECTOR );
 		expect( sidebar ).toBeNull();
 	} );
@@ -61,7 +60,8 @@ describe( 'Publishing', () => {
 
 	it( 'Should reopen sidebar the sidebar when resizing from mobile to desktop if the sidebar was closed automatically', async () => {
 		await setViewport( 'large' );
-		await newPost( { viewport: 'small' } );
+		await newPost();
+		await setViewport( 'small' );
 
 		const sidebarsMobile = await page.$$( SIDEBAR_SELECTOR );
 		expect( sidebarsMobile ).toHaveLength( 0 );

diff --git a/test/e2e/support/setup-test-framework.js b/test/e2e/support/setup-test-framework.js
@@ -10,6 +10,7 @@ import {
 	clearLocalStorage,
 	disablePageDialogAccept,
 	enablePageDialogAccept,
+	setViewport,
 	visitAdmin,
 } from './utils';
 
@@ -22,6 +23,7 @@ const { PUPPETEER_TIMEOUT } = process.env;
 jest.setTimeout( PUPPETEER_TIMEOUT || 100000 );
 
 beforeAll( async () => {
+	await setViewport( 'large' );
 	enablePageDialogAccept();
 } );
 

diff --git a/test/e2e/support/utils.js b/test/e2e/support/utils.js
@@ -86,11 +86,9 @@ export async function visitAdmin( adminPath, query ) {
 	}
 }
 
-export async function newPost( { postType, viewport = 'large', enableTips = false } = {} ) {
+export async function newPost( { postType, enableTips = false } = {} ) {
 	await visitAdmin( 'post-new.php', postType ? 'post_type=' + postType : '' );
 
-	setViewport( viewport );
-
 	const tipsEnabled = await page.evaluate( () => wp.data.select( 'core/nux' ).areTipsEnabled() );
 	if ( tipsEnabled && ! enableTips ) {
 		// Disable new user tips so that their UI doesn't get in the way