Merge branch 'e2e/55-default-admin-settings' of github.com:10up/restr…

…icted-site-access into e2e/55-default-admin-settings
10up · Oct 18, 2021 · 53f37a1 · 53f37a1
2 parents 3e874b7 + 3caa574
commit 53f37a1
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -1,3 +1,5 @@
+name: E2E Tests
+
 on:
   push:
     branches:

diff --git a/tests/cypress/integration/rsa-admin-settings-interaction.js b/tests/cypress/integration/rsa-admin-settings-interaction.js
@@ -23,7 +23,7 @@ describe( 'Plugin admin settings are properly interactive.', () => {
 			.should( 'not.be.visible' );
 	} );
 
-	it ( 'Select "Site visibility: no robots" radio button', function() {
+	it ( 'Select "Site visibility: blog restrcited" radio button', function() {
 		cy
 			.get( '#blog-restricted' )
 			.check();

diff --git a/tests/cypress/integration/rsa-redirect-to-login.js b/tests/cypress/integration/rsa-redirect-to-login.js
@@ -3,7 +3,7 @@ describe( 'Send restricted visitors to login page', () => {
 		cy.visitAdminPage( 'options-reading.php' );
 		cy.get( '#blog-restricted' ).check();
 		cy.get( '#rsa-send-to-login' ).check();
-		cy.saveRsaSettings();
+		cy.saveSettings();
 		cy.logout();
 	} );
 

diff --git a/tests/cypress/integration/rsa-redirect-to-web-address.js b/tests/cypress/integration/rsa-redirect-to-web-address.js
@@ -1,5 +1,7 @@
 describe( 'Send restricted visitors to a web address', () => {
 	before( () => {
+		cy.setPermalink();
+		cy.saveSettings();
 		cy.visitAdminPage( 'options-reading.php' );
 		cy.get( '#blog-restricted' ).check();
 		cy.get( '#rsa-redirect-visitor' ).check();
@@ -8,7 +10,8 @@ describe( 'Send restricted visitors to a web address', () => {
 			.get( 'input[name="rsa_options[redirect_url]"]' )
 			.clear()
 			.type( `${ Cypress.config().baseUrl }non-existent-page` )
-		cy.saveRsaSettings();
+		cy.saveSettings();
+
 		cy.logout();
 	} );
 
@@ -43,12 +46,12 @@ function testRedirectStatusCode( $status_code = 301 ) {
 	cy
 		.get( '.rsa-setting_settings_field_redirect_code #redirect_code' )
 		.select( `${ $status_code }` );
-	cy.saveRsaSettings();
+	cy.saveSettings();
 	cy.logout();
 
 	cy.request({
 		method: 'GET',
-		url: 'http://osp.local/',
+		url: Cypress.config().baseUrl,
 		failOnStatusCode: false,
 		followRedirect: false
 	} ).then( ( response ) => {

diff --git a/tests/cypress/integration/rsa-redirection-settings.js b/tests/cypress/integration/rsa-redirection-settings.js
@@ -12,7 +12,7 @@ describe( 'Admin can correctly save redirection settings', () => {
 			.type( `${ Cypress.config().baseUrl }non-existent-page` )
 			.should( 'have.value', `${ Cypress.config().baseUrl }non-existent-page` );
 
-		cy.saveRsaSettings();
+		cy.saveSettings();
 	} );
 
 	it( 'Can check "Redirect to same path" checkbox', () => {
@@ -21,7 +21,7 @@ describe( 'Admin can correctly save redirection settings', () => {
 			.check()
 			.should( 'be.checked' );
 
-		cy.saveRsaSettings();
+		cy.saveSettings();
 	} );
 
 	it( 'Can select any of the "Redirection status code" options', () => {
@@ -34,7 +34,7 @@ describe( 'Admin can correctly save redirection settings', () => {
 			.select( '307' )
 			.should( 'have.value', '307' );
 
-		cy.saveRsaSettings();
+		cy.saveSettings();
 	} );
 
 	it( 'Verify all settings are correctly saved', () => {

diff --git a/tests/cypress/integration/rsa-simple-message-settings.js b/tests/cypress/integration/rsa-simple-message-settings.js
@@ -23,7 +23,7 @@ describe( 'Admin can correctly save redirection settings', () => {
 			.get( '#rsa_message' )
 			.should( 'have.value', '<strong>This is a restricted site. Please contact the admin.</strong>' );
 
-		cy.saveRsaSettings();
+		cy.saveSettings();
 	} );
 
 	it( 'Verify all settings are correctly saved', () => {

diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
@@ -82,7 +82,7 @@ Cypress.Commands.add( 'openDocumentSettingsPanel', ( name ) => {
 		} );
 } );
 
-Cypress.Commands.add( 'saveRsaSettings', () => {
+Cypress.Commands.add( 'saveSettings', () => {
 	cy
 		.get( '#submit' )
 		.click();
@@ -96,3 +96,11 @@ Cypress.Commands.add( 'logout', () => {
 			cy.visit( href );
 		} );
 } );
+
+Cypress.Commands.add( 'setPermalink', () => {
+	cy.visitAdminPage( 'options-permalink.php' );
+	cy
+		.get( 'form[action="options-permalink.php"] input[type="radio"]' )
+		.eq(4)
+		.check();
+} );