Merge pull request #3333 from WordPress/update/e2e-new-post-login-red…

…irect

Testing: Optimize e2e testing path navigation

test/e2e/integration/001-hello-gutenberg.js

@@ -1,13 +1,9 @@
 describe( 'Hello Gutenberg', () => {
 	before( () => {
-		cy.login();
+		cy.newPost();
 	} );
 
 	it( 'Should show the New Post Page in Gutenberg', () => {
-		// Navigate to New Post
-		cy.get( '.wp-menu-name' ).contains( 'Posts' ).click();
-		cy.get( '.wp-submenu a' ).contains( 'Add New' ).click();
-
 		// Assertions
 		cy.url().should( 'include', 'post-new.php' );
 		cy.get( '[placeholder="Add title"]' ).should( 'exist' );

test/e2e/integration/002-adding-blocks.js

@@ -1,6 +1,5 @@
 describe( 'Adding blocks', () => {
 	before( () => {
-		cy.login();
 		cy.newPost();
 	} );
 

test/e2e/support/gutenberg-commands.js

@@ -1,3 +1,11 @@
 Cypress.Commands.add( 'newPost', () => {
-	cy.visit( '/wp-admin/post-new.php' );
+	cy.visitAdmin( '/post-new.php' );
+} );
+
+Cypress.Commands.add( 'visitAdmin', ( adminPath ) => {
+	cy.visit( '/wp-admin/' + adminPath ).location( 'pathname' ).then( ( path ) => {
+		if ( path === '/wp-login.php' ) {
+			cy.login();
+		}
+	} );
 } );

test/e2e/support/index.js

@@ -1,2 +1,6 @@
 import './user-commands';
 import './gutenberg-commands';
+
+Cypress.Cookies.defaults( {
+	whitelist: /^wordpress_/,
+} );

test/e2e/support/user-commands.js

@@ -3,7 +3,11 @@ Cypress.Commands.add( 'login', ( username = Cypress.env( 'username' ), password
 	// and fake it by calling an API and setting a cookie
 	// (not sure this is possible in WP)
 
-	cy.visit( '/wp-admin' );
+	cy.location( 'pathname' ).then( ( path ) => {
+		if ( path !== '/wp-login.php' ) {
+			cy.visit( '/wp-login.php' );
+		}
+	} );
 	cy.get( '#user_login' ).type( username );
 	cy.get( '#user_pass' ).type( password );
 	cy.get( '#wp-submit' ).click();