Merge pull request #191 from KevinBatdorf/test-with-wp-7

Author: KevinBatdorf

.github/workflows/cypress-main.yml

@@ -8,6 +8,18 @@ on:
         # At 08:00 daily
         - cron: '0 8 * * *'
 jobs:
+    lint:
+        name: Lint and Build
+        runs-on: ubuntu-latest
+        steps:
+            - name: Clone repo
+              uses: actions/checkout@v4
+
+            - name: Install and Build
+              run: |
+                  npm ci
+                  npx eslint --max-warnings 0 .
+                  npm run build
     test:
         name: WordPress ${{ matrix.wp-version }} (${{ matrix.spec }})
         concurrency:
@@ -26,7 +38,6 @@ jobs:
             - name: Install and Build
               run: |
                   npm ci
-                  npx eslint --max-warnings 0 .
                   npm run build
             - name: Get Latest WP Branch
               if: ${{ matrix.wp-version }}
@@ -50,16 +61,17 @@ jobs:
               uses: cypress-io/github-action@v6
               with:
                   browser: chrome
+                  install: false
                   spec: cypress/e2e/${{ matrix.spec }}.cy.js
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - uses: actions/upload-artifact@v4
               if: failure()
               with:
-                  name: cypress-screenshots
+                  name: cypress-screenshots-${{ matrix.spec }}
                   path: cypress/screenshots
             - uses: actions/upload-artifact@v4
               if: failure()
               with:
-                  name: cypress-videos
+                  name: cypress-videos-${{ matrix.spec }}
                   path: cypress/videos

.github/workflows/cypress-push.yml

@@ -5,6 +5,18 @@ on:
             - main
     workflow_dispatch:
 jobs:
+    lint:
+        name: Lint and Build
+        runs-on: ubuntu-latest
+        steps:
+            - name: Clone repo
+              uses: actions/checkout@v4
+
+            - name: Install and build
+              run: |
+                  npm ci
+                  npx eslint --max-warnings 0 .
+                  npm run build
     test:
         name: WordPress (${{ matrix.spec }})
         concurrency:
@@ -22,7 +34,6 @@ jobs:
             - name: Install and build
               run: |
                   npm ci
-                  npx eslint --max-warnings 0 .
                   npm run build
             - name: Start server
               run: |
@@ -33,16 +44,17 @@ jobs:
               uses: cypress-io/github-action@v6
               with:
                   browser: chrome
+                  install: false
                   spec: cypress/e2e/${{ matrix.spec }}.cy.js
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - uses: actions/upload-artifact@v4
               if: failure()
               with:
-                  name: cypress-screenshots
+                  name: cypress-screenshots-${{ matrix.spec }}
                   path: cypress/screenshots
             - uses: actions/upload-artifact@v4
               if: failure()
               with:
-                  name: cypress-videos
+                  name: cypress-videos-${{ matrix.spec }}
                   path: cypress/videos

cypress/e2e/block.cy.js

@@ -314,15 +314,10 @@ context('Pattern Css (Block)', () => {
 		});
 	});
 	it('Removes @import, @keyframes, and others', () => {
-		const css = `@charset "UTF-8";
-		  @import url('https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css');
-		  @media screen and (max-width: 600px) { .f { foo: 'bar';} }
-		  @page :left {}
-		  @font-face {font-family: MyFont;src: url('myfont.woff2');}
-		  @keyframes slidein {from {}to {}}
-		  @view-transition { navigation: auto }
-		  @counter-style customCounter { system: cyclic; }
-		  @namespace svg url(http://www.w3.org/2000/svg);`;
+		const css = `@font-face {font-family: MyFont;src: url('myfont.woff2');}
+		  @keyframes slidein {from {opacity: 0} to {opacity: 1}}
+		  @media screen and (max-width: 600px) { [block] { color: red; } }
+		  [block] { padding: 1rem; }`;
 
 		cy.withEditorWp((_win, wp) => {
 			const block = wp.blocks.createBlock('core/group', {}, [
@@ -340,7 +335,7 @@ context('Pattern Css (Block)', () => {
 
 			cy.previewCurrentPage();
 
-			// should not have any of the rules except media query
+			// should not have any of the rules except media query and block styles
 			cy.get(`style#pcss-block-${className}-inline-css`)
 				.invoke('text')
 				.should('not.contain', '@import')
@@ -352,7 +347,8 @@ context('Pattern Css (Block)', () => {
 				.and('not.contain', '@view-transition')
 				.and('not.contain', '@counter-style')
 				.and('not.contain', '@namespace')
-				.and('contain', '@media');
+				.and('contain', '@media')
+				.and('contain', 'padding');
 		});
 	});
 });

cypress/support/wp-cli.js

@@ -1,10 +1,33 @@
+let snapshotCreated = false;
+
+const createSnapshot = () => {
+	cy.exec('wp-env run cli wp db export /tmp/clean-snapshot.sql', {
+		failOnNonZeroExit: false,
+	});
+	snapshotCreated = true;
+};
+
+const restoreSnapshot = () => {
+	cy.exec('wp-env run cli wp db import /tmp/clean-snapshot.sql', {
+		failOnNonZeroExit: false,
+	});
+	cy.exec('wp-env run cli wp cache flush', {
+		failOnNonZeroExit: false,
+	});
+};
+
 export const resetDatabase = () => {
+	if (snapshotCreated) {
+		restoreSnapshot();
+		return;
+	}
 	cy.exec('wp-env clean all', {
 		failOnNonZeroExit: false,
 	});
 	cy.exec(
 		'wp-env run cli wp user meta add 1 wp_persisted_preferences \'{"core/edit-post":{"welcomeGuide":false,"core/edit-post/pattern-modal":false,"pattern-modal":false,"edit-post/pattern-modal":false,"patternModal":false},"core":{"enableChoosePatternModal":false},"_modified":"2025-03-23T02:16:33.561Z"}\' --format=json',
 	);
+	createSnapshot();
 };
 export const installPlugin = (slug) =>
 	cy.exec(`wp-env run cli wp plugin install ${slug} --activate`, {