Continue migrating E2E tests to Cypress.

.github/workflows/cypress.yml

@@ -101,7 +101,7 @@ jobs:
       run: npm run copy-htaccess
 
     - name: Test
-      run: npm run cypress:run
+      run: npm run cypress:run --config-file tests/cypress/config.js
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v2

assets/css/gutenberg-syndicated-post.scss

@@ -19,6 +19,7 @@ body.dt-linked-post {
 		cursor: default;
 	}
 
+	.edit-post-welcome-guide,
 	.edit-post-header__settings,
 	.components-time-picker,
 	.react-datepicker,

tests/cypress/e2e/distributed-post.test.js

@@ -0,0 +1,107 @@
+const { randomName } = require( '../support/functions' );
+
+describe( 'Distributed Post Tests', () => {
+	let externalConnectionName = '';
+
+	before( () => {
+		cy.login();
+		cy.networkActivatePlugin( 'distributor' );
+		cy.networkActivatePlugin( 'json-basic-authentication' );
+
+		externalConnectionName = 'Connection ' + randomName();
+		cy.createExternalConnection(
+			externalConnectionName,
+			'http://localhost/second/wp-json'
+		);
+	} );
+
+	it( 'Counter should increase after distributing a post', () => {
+		const postTitle = 'Post to push ' + randomName();
+
+		cy.createPost( { title: postTitle } ).then( ( post ) => {
+			cy.distributorPushPost( post.id, 'second', '', 'publish' );
+			// Return the the post edit screen.
+			cy.visit( '/wp-admin/post.php?post=' + post.id + '&action=edit' );
+			// Ensure the settings panel is open.
+			cy.get( 'button[aria-label="Settings"]' ).then( ( $settings ) => {
+				if ( $settings.attr( 'aria-expanded' ) === 'false' ) {
+					$settings.trigger( 'click' );
+				}
+				cy.openDocumentSettingsSidebar( 'Post' );
+				cy.openDocumentSettingsPanel( 'Distributor' );
+				cy.get( '#distributed-to' ).should(
+					'contain.text',
+					'Distributed to 1 connection'
+				);
+			} );
+
+			cy.distributorPushPost(
+				post.id,
+				externalConnectionName,
+				'',
+				'publish'
+			);
+			// Return the the post edit screen.
+			cy.visit( '/wp-admin/post.php?post=' + post.id + '&action=edit' );
+			// Ensure the settings panel is open.
+			cy.get( 'button[aria-label="Settings"]' ).then( ( $settings ) => {
+				if ( $settings.attr( 'aria-expanded' ) === 'false' ) {
+					$settings.trigger( 'click' );
+				}
+				cy.openDocumentSettingsSidebar( 'Post' );
+				cy.openDocumentSettingsPanel( 'Distributor' );
+				cy.get( '#distributed-to' ).should(
+					'contain.text',
+					'Distributed to 2 connections'
+				);
+			} );
+		} );
+	} );
+
+	it( 'Should display source information in distributed copies of content', () => {
+		const postTitle = 'Post to push ' + randomName();
+
+		cy.createPost( { title: postTitle } ).then( ( sourcePost ) => {
+			cy.distributorPushPost(
+				sourcePost.id,
+				'second',
+				'',
+				'publish'
+			).then( ( distributedPost ) => {
+				cy.visit( distributedPost.distributedFrontUrl );
+				cy.get( '#wp-admin-bar-distributor .syndicated-notice' )
+					.should( 'contain.text', 'This post was distributed from' )
+					.should( 'contain.text', 'View the origin post.' );
+				cy.get( 'link[rel=canonical]' ).should(
+					'have.attr',
+					'href',
+					sourcePost.link
+				);
+
+				cy.visit( distributedPost.distributedEditUrl );
+				cy.closeWelcomeGuide();
+				cy.get( '.components-notice__content' )
+					.should( 'contain.text', 'Distributed from' )
+					.should(
+						'contain.text',
+						'This post is linked to the origin post. Edits to the origin post will update this remote version.'
+					);
+
+				// Ensure the settings panel is open.
+				cy.get( 'button[aria-label="Settings"]' ).then(
+					( $settings ) => {
+						if ( $settings.attr( 'aria-expanded' ) === 'false' ) {
+							$settings.trigger( 'click' );
+						}
+						cy.openDocumentSettingsSidebar( 'Post' );
+						cy.openDocumentSettingsPanel( 'Distributor' );
+						cy.get( '#distributed-from' ).should(
+							'contain.text',
+							'Distributed on'
+						);
+					}
+				);
+			} );
+		} );
+	} );
+} );

tests/cypress/e2e/editor-blocks.test.js

@@ -0,0 +1,116 @@
+const { randomName } = require( '../support/functions' );
+
+describe( 'Distributed content block tests', () => {
+	let externalConnectionOneToTwo, externalConnectionTwoToOne;
+
+	before( () => {
+		cy.login();
+		cy.networkActivatePlugin( 'distributor' );
+		cy.networkActivatePlugin( 'json-basic-authentication' );
+
+		externalConnectionOneToTwo = 'Site Two ' + randomName();
+		cy.createExternalConnection(
+			externalConnectionOneToTwo,
+			'http://localhost/second/wp-json'
+		);
+
+		externalConnectionTwoToOne = 'Site One ' + randomName();
+		cy.createExternalConnection(
+			externalConnectionTwoToOne,
+			'http://localhost/wp-json',
+			'admin',
+			'password',
+			'second'
+		);
+	} );
+
+	it( 'Should distribute blocks when pushing to network connections.', () => {
+		const postTitle = 'Post to push ' + randomName();
+
+		cy.createPost( { title: postTitle } ).then( ( sourcePost ) => {
+			cy.distributorPushPost(
+				sourcePost.id,
+				'second',
+				'',
+				'publish'
+			).then( ( distributedPost ) => {
+				cy.postContains(
+					distributedPost.distributedPostId,
+					'<!-- wp:paragraph -->',
+					'http://localhost/second/'
+				);
+			} );
+		} );
+	} );
+
+	it( 'Should distribute blocks when pulling from network connections.', () => {
+		const postTitle = 'Post to pull ' + randomName();
+
+		cy.createPost( { title: postTitle } ).then( ( sourcePost ) => {
+			cy.distributorPullPost(
+				sourcePost.id,
+				'second',
+				'',
+				'localhost'
+			).then( ( distributedPost ) => {
+				cy.closeWelcomeGuide();
+				const matches =
+					distributedPost.distributedEditUrl.match( /post=(\d+)/ );
+				let distributedPostId;
+				if ( matches ) {
+					distributedPostId = matches[ 1 ];
+				}
+				cy.postContains(
+					distributedPostId,
+					'<!-- wp:paragraph -->',
+					'http://localhost/second/'
+				);
+			} );
+		} );
+	} );
+
+	it( 'Should distribute blocks when pushing to external connections.', () => {
+		const postTitle = 'Post to push ' + randomName();
+
+		cy.createPost( { title: postTitle } ).then( ( sourcePost ) => {
+			cy.distributorPushPost(
+				sourcePost.id,
+				externalConnectionOneToTwo,
+				'',
+				'publish'
+			).then( ( distributedPost ) => {
+				cy.postContains(
+					distributedPost.distributedPostId,
+					'<!-- wp:paragraph -->',
+					'http://localhost/second/'
+				);
+			} );
+		} );
+	} );
+
+	it( 'Should distribute blocks when pulling from external connections.', () => {
+		const postTitle = 'Post to pull ' + randomName();
+
+		cy.createPost( { title: postTitle } ).then( ( sourcePost ) => {
+			cy.distributorPullPost(
+				sourcePost.id,
+				'/second/', // Pull to second site.
+				'', // From primary site.
+				externalConnectionTwoToOne
+			).then( ( distributedPost ) => {
+				cy.closeWelcomeGuide();
+				const matches =
+					distributedPost.distributedEditUrl.match( /post=(\d+)/ );
+				let distributedPostId;
+				if ( matches ) {
+					distributedPostId = matches[ 1 ];
+				}
+				cy.postContains(
+					distributedPostId,
+					'<!-- wp:paragraph -->',
+					'http://localhost/second/'
+				);
+			} );
+		} );
+	} );
+} );

tests/cypress/e2e/external-connection.test.js

@@ -95,4 +95,23 @@ describe( 'Admin can add a new external connection', () => {
 			.find( '.connection-status' )
 			.should( 'have.class', 'error' );
 	} );
+
+	it( 'Should display limited connection warning', () => {
+		cy.visit( '/wp-admin/admin.php?page=distributor' );
+		cy.get( '.page-title-action' ).contains( 'Add New' ).click();
+
+		const name = randomName();
+		cy.get( '#title' ).click().type( name );
+
+		cy.get( '.manual-setup-button' ).click();
+		cy.get( '#dt_username' ).type( 'invalid_username' );
+		cy.get( '#dt_password' ).type( 'invalid_password' );
+		cy.get( '#dt_external_connection_url' ).type(
+			'http://localhost/second/wp-json'
+		);
+		cy.get( '.description.endpoint-result' ).should(
+			'contain.text',
+			'Limited connection established.'
+		);
+	} );
 } );

tests/cypress/e2e/internal-push.test.js

@@ -57,6 +57,10 @@ describe( 'Internal Push', () => {
 			);
 
 			// Set Featured Image
+			// This test is temporarily disabled due to failures in GitHub actions that are not reproducible locally.
+			// On GitHub the success message expected within the cy.distributorPushPost command is not found as the
+			// distribution fails with an undefined error.
+
 			// cy.uploadMedia( 'assets/img/banner-772x250.png' ).then(
 			// 	( media ) => {
 			// 		if ( media && media.mediaId ) {