Merge pull request #181 from 10up/upkeep/178

Fix E2E tests

package.json

@@ -39,11 +39,11 @@
     "node": ">=12.0"
   },
   "devDependencies": {
-    "@10up/cypress-wp-utils": "github:10up/cypress-wp-utils#build",
-    "@wordpress/env": "^5.6.0",
+    "@10up/cypress-wp-utils": "^0.2.0",
+    "@wordpress/env": "^8.7.0",
     "@wordpress/eslint-plugin": "^10.0.1",
     "@wordpress/scripts": "^24.6.0",
-    "cypress": "^13.1.0",
-    "cypress-mochawesome-reporter": "^3.4.0"
+    "cypress": "^13.2.0",
+    "cypress-mochawesome-reporter": "^3.6.0"
   }
 }

tests/bin/initialize.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-npm run env run tests-wordpress "chmod -c ugo+w /var/www/html"
-npm run env run tests-cli "wp rewrite structure '/%postname%/' --hard"
+wp-env run tests-wordpress chmod -c ugo+w /var/www/html
+wp-env run tests-cli wp rewrite structure '/%postname%/' --hard

tests/cypress/config.js

@@ -1,5 +1,6 @@
 const { defineConfig } = require('cypress');
-const { readConfig }   = require('@wordpress/env/lib/config');
+const { loadConfig } = require( '@wordpress/env/lib/config' );
+const getCacheDirectory = require( '@wordpress/env/lib/config/get-cache-directory' );
 
 module.exports = defineConfig({
   fixturesFolder: 'tests/cypress/fixtures',
@@ -26,13 +27,14 @@ module.exports = defineConfig({
 
 /**
  * Set WP URL as baseUrl in Cypress config.
- * 
+ *
  * @param {Function} on    function that used to register listeners on various events.
  * @param {object} config  Cypress Config object.
  * @returns config Updated Cypress Config object.
  */
 const setBaseUrl = async (on, config) => {
-  const wpEnvConfig = await readConfig('wp-env');
+  const cacheDirectory = await getCacheDirectory();
+  const wpEnvConfig = await loadConfig( cacheDirectory );
 
   if (wpEnvConfig) {
     const port = wpEnvConfig.env.tests.port || null;

tests/cypress/e2e/block.test.js

@@ -1,9 +1,6 @@
 describe("Test block functions", () => {
-	before(() => {
-		cy.login();
-	});
-
 	beforeEach(() => {
+		cy.login();
 		cy.mapsBlockSaveSettings();
 	});
 

tests/cypress/e2e/settings.test.js

@@ -1,5 +1,5 @@
 describe("Settings", () => {
-	before(() => {
+	beforeEach(() => {
 		cy.login();
 	});
 

tests/cypress/support/e2e.js

@@ -17,11 +17,3 @@ import "@10up/cypress-wp-utils";
 
 // Import commands.js using ES2015 syntax:
 import "./commands";
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-beforeEach(() => {
-  Cypress.Cookies.defaults({
-    preserve: /^wordpress.*?/,
-  });
-});