Revert new Gutenberg Preview and use old Calypso preview instead

Automattic · Mar 25, 2020 · 5d9870d · 5d9870d
1 parent d7c034c
commit 5d9870d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 35 deletions.
diff --git a/test/e2e/lib/gutenberg/gutenberg-editor-component.js b/test/e2e/lib/gutenberg/gutenberg-editor-component.js
@@ -339,28 +339,14 @@ export default class GutenbergEditorComponent extends AsyncBaseContainer {
 		return await driverHelper.clickWhenClickable( this.driver, By.css( '.components-snackbar' ) );
 	}
 
+	// @TODO: Update to new `.editor-post-preview__dropdown` format once we support it again
+	// https://github.com/Automattic/wp-calypso/issues/40401
 	async launchPreview() {
-		if ( driverManager.currentScreenSize() === 'mobile' ) {
-			return await driverHelper.clickWhenClickable(
-				this.driver,
-				By.css( '.components-button.editor-post-preview' ),
-				this.explicitWaitMS
-			);
-		}
-
 		return await driverHelper.clickWhenClickable(
 			this.driver,
-			// @TODO: Update to new `.editor-post-preview__dropdown` format once we support it again
-			// https://github.com/Automattic/wp-calypso/issues/40401
-			By.css( '.editor-post-preview' ),
+			By.css( '.components-button.editor-post-preview' ),
 			this.explicitWaitMS
 		);
-		// @TODO: Enable again once we support dropdown preview again
-		// https://github.com/Automattic/wp-calypso/issues/40401
-		//
-		// const editorPostPreviewSelector = By.css( '.editor-post-preview__button-external' );
-		// await driverHelper.waitTillPresentAndDisplayed( this.driver, editorPostPreviewSelector );
-		// return await driverHelper.clickWhenClickable( this.driver, editorPostPreviewSelector );
 	}
 
 	async revertToDraft() {

diff --git a/test/e2e/specs/wp-calypso-gutenberg-page-editor-spec.js b/test/e2e/specs/wp-calypso-gutenberg-page-editor-spec.js
@@ -15,7 +15,6 @@ import NotFoundPage from '../lib/pages/not-found-page.js';
 import PaypalCheckoutPage from '../lib/pages/external/paypal-checkout-page';
 import GutenbergEditorComponent from '../lib/gutenberg/gutenberg-editor-component';
 import GutenbergEditorSidebarComponent from '../lib/gutenberg/gutenberg-editor-sidebar-component';
-import PagePreviewExternalComponent from '../lib/components/page-preview-external-component';
 import PagePreviewComponent from '../lib/components/page-preview-component';
 import SimplePaymentsBlockComponent from '../lib/gutenberg/blocks/payment-block-component';
 
@@ -96,13 +95,9 @@ describe( `[${ host }] Calypso Gutenberg Editor: Pages (${ screenSize })`, funct
 		} );
 
 		step( 'Can see correct page title in preview', async function() {
-			if ( driverManager.currentScreenSize() === 'mobile' ) {
-				this.pagePreviewComponent = await PagePreviewComponent.Expect( driver );
-				await this.pagePreviewComponent.displayed();
-			} else {
-				this.pagePreviewComponent = new PagePreviewExternalComponent( driver );
-			}
-			const actualPageTitle = await this.pagePreviewComponent.pageTitle();
+			const pagePreviewComponent = await PagePreviewComponent.Expect( driver );
+			await pagePreviewComponent.displayed();
+			const actualPageTitle = await pagePreviewComponent.pageTitle();
 			assert.strictEqual(
 				actualPageTitle.toUpperCase(),
 				pageTitle.toUpperCase(),
@@ -111,7 +106,8 @@ describe( `[${ host }] Calypso Gutenberg Editor: Pages (${ screenSize })`, funct
 		} );
 
 		step( 'Can see correct page content in preview', async function() {
-			const content = await this.pagePreviewComponent.pageContent();
+			const pagePreviewComponent = await PagePreviewComponent.Expect( driver );
+			const content = await pagePreviewComponent.pageContent();
 			assert.strictEqual(
 				content.indexOf( pageQuote ) > -1,
 				true,
@@ -124,7 +120,8 @@ describe( `[${ host }] Calypso Gutenberg Editor: Pages (${ screenSize })`, funct
 		} );
 
 		step( 'Can see the image uploaded in the preview', async function() {
-			const imageDisplayed = await this.pagePreviewComponent.imageDisplayed( fileDetails );
+			const pagePreviewComponent = await PagePreviewComponent.Expect( driver );
+			const imageDisplayed = await pagePreviewComponent.imageDisplayed( fileDetails );
 			return assert.strictEqual(
 				imageDisplayed,
 				true,
@@ -133,7 +130,8 @@ describe( `[${ host }] Calypso Gutenberg Editor: Pages (${ screenSize })`, funct
 		} );
 
 		step( 'Can close page preview', async function() {
-			await this.pagePreviewComponent.close();
+			const pagePreviewComponent = await PagePreviewComponent.Expect( driver );
+			await pagePreviewComponent.close();
 		} );
 
 		step( 'Can publish and preview published content', async function() {

diff --git a/test/e2e/specs/wp-calypso-gutenberg-post-editor-spec.js b/test/e2e/specs/wp-calypso-gutenberg-post-editor-spec.js
@@ -20,7 +20,6 @@ import SidebarComponent from '../lib/components/sidebar-component.js';
 import NoticesComponent from '../lib/components/notices-component.js';
 import NavBarComponent from '../lib/components/nav-bar-component.js';
 import PostPreviewComponent from '../lib/components/post-preview-component';
-import PostPreviewExternalComponent from '../lib/components/post-preview-external-component';
 import RevisionsModalComponent from '../lib/components/revisions-modal-component';
 import GutenbergEditorComponent from '../lib/gutenberg/gutenberg-editor-component';
 import GutenbergEditorSidebarComponent from '../lib/gutenberg/gutenberg-editor-sidebar-component';
@@ -130,12 +129,7 @@ describe( `[${ host }] Calypso Gutenberg Editor: Posts (${ screenSize })`, funct
 		} );
 
 		step( 'Can see correct post title in preview', async function() {
-			if ( driverManager.currentScreenSize() === 'mobile' ) {
-				this.postPreviewComponent = await PostPreviewComponent.Expect( driver );
-				await this.postPreviewComponent.displayed();
-			} else {
-				this.postPreviewComponent = new PostPreviewExternalComponent( driver );
-			}
+			this.postPreviewComponent = await PostPreviewComponent.Expect( driver );
 
 			const postTitle = await this.postPreviewComponent.postTitle();
 			assert.strictEqual(