More stable tests by increasing timeouts and launching a new page on …

…each test
WordPress · Mar 21, 2018 · e35fbfa · e35fbfa
1 parent 67813ee
commit e35fbfa
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/test/e2e/specs/a11y.test.js b/test/e2e/specs/a11y.test.js
@@ -2,10 +2,11 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost } from '../support/utils';
+import { newPost, newDesktopBrowserPage } from '../support/utils';
 
 describe( 'a11y', () => {
 	beforeAll( async () => {
+		await newDesktopBrowserPage();
 		await newPost();
 	} );
 

diff --git a/test/e2e/specs/adding-blocks.test.js b/test/e2e/specs/adding-blocks.test.js
@@ -2,10 +2,11 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost } from '../support/utils';
+import { newPost, newDesktopBrowserPage } from '../support/utils';
 
 describe( 'adding blocks', () => {
 	beforeAll( async () => {
+		await newDesktopBrowserPage();
 		await newPost();
 	} );
 

diff --git a/test/e2e/specs/hello.test.js b/test/e2e/specs/hello.test.js
@@ -2,10 +2,11 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost, visitAdmin } from '../support/utils';
+import { newPost, visitAdmin, newDesktopBrowserPage } from '../support/utils';
 
 describe( 'hello', () => {
 	beforeAll( async () => {
+		await newDesktopBrowserPage();
 		await newPost();
 	} );
 

diff --git a/test/e2e/specs/managing-links.test.js b/test/e2e/specs/managing-links.test.js
@@ -2,14 +2,12 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost } from '../support/utils';
+import { newPost, newDesktopBrowserPage } from '../support/utils';
 
 describe( 'Managing links', () => {
 	beforeEach( async () => {
+		await newDesktopBrowserPage();
 		await newPost();
-		await page.on( 'dialog', async dialog => {
-			await dialog.accept();
-		} );
 	} );
 
 	const setFixedToolbar = async ( b ) => {

diff --git a/test/e2e/specs/multi-block-selection.test.js b/test/e2e/specs/multi-block-selection.test.js
@@ -2,10 +2,11 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost } from '../support/utils';
+import { newPost, newDesktopBrowserPage } from '../support/utils';
 
 describe( 'Multi-block selection', () => {
 	beforeAll( async () => {
+		await newDesktopBrowserPage();
 		await newPost();
 	} );
 

diff --git a/test/e2e/support/bootstrap.js b/test/e2e/support/bootstrap.js
@@ -1,12 +1,10 @@
 import puppeteer from 'puppeteer';
 
 // The Jest timeout is increased because these tests are a bit slow
-jest.setTimeout( 50000 );
+jest.setTimeout( 100000 );
 
 beforeAll( async () => {
 	global.browser = await puppeteer.launch();
-	global.page = await browser.newPage();
-	await page.setViewport( { width: 1000, height: 700 } );
 } );
 
 afterAll( async () => {

diff --git a/test/e2e/support/utils.js b/test/e2e/support/utils.js
@@ -35,3 +35,9 @@ export async function visitAdmin( adminPath ) {
 export async function newPost() {
 	await visitAdmin( 'post-new.php' );
 }
+
+export async function newDesktopBrowserPage() {
+	global.page = await browser.newPage();
+	await page.setViewport( { width: 1000, height: 700 } );
+	await page.setDefaultNavigationTimeout( 60000 );
+}