Migrate dynamic HR to core/separator

.circleci/config.yml

@@ -82,6 +82,20 @@ executors:
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
+  php_80_browsers_mysql_mailhog:
+    docker:
+      - image: cimg/php:8.0-browsers
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_PASSWORD
+      - image: cimg/mysql:5.7
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_PASSWORD
+      - image: mailhog/mailhog:v1.0.1
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_PASSWORD
   php_74_node:
     docker:
       - image: cimg/php:7.4-node
@@ -176,12 +190,12 @@ workflows:
           requires:
             - build
 
-      # - e2e_chrome_wp_previous_major:
-      #    filters:
-      #      tags:
-      #        only: /^(?!canary).*$/
-      #    requires:
-      #      - build
+      - e2e_chrome_wp_php80:
+          filters:
+            tags:
+              only: /^(?!canary).*$/
+          requires:
+            - build
 
       # PERF TESTING
       - perf_tests_master:
@@ -774,6 +788,14 @@ jobs:
           browser: chrome
           theme: twentytwentytwo
 
+  e2e_chrome_wp_php80:
+    executor: php_80_browsers_mysql_mailhog
+    parallelism: 11
+    steps:
+      - run_e2e_tests:
+          browser: chrome
+          theme: twentytwentytwo
+
   perf_tests_master:
     executor: php_74_browsers_mysql
     steps:

.dev/tests/cypress/helpers.js

@@ -1,8 +1,3 @@
-/**
- * Internal dependencies.
- */
-import coblocksLayoutSelector from '../../../src/extensions/layout-selector/test/cypress-layouts';
-
 /**
  * Close layout selector.
  */
@@ -64,15 +59,7 @@ export function loginToSite() {
 export function goTo( path = '/wp-admin' ) {
 	cy.visit( Cypress.env( 'testURL' ) + path );
 
-	return getWindowObject().then( ( safeWin ) => {
-		// Only set global `safeWin.coblocksLayoutSelector` on new pages.
-		if ( safeWin.location.href.includes( 'post-new.php?post_type=page' ) ) {
-			safeWin.coblocksLayoutSelector = coblocksLayoutSelector;
-
-			safeWin.wp.data.dispatch( 'coblocks/template-selector' ).updateLayouts( coblocksLayoutSelector.layouts );
-			safeWin.wp.data.dispatch( 'coblocks/template-selector' ).updateCategories( coblocksLayoutSelector.categories );
-		}
-	} );
+	return getWindowObject();
 }
 
 /**
@@ -460,6 +447,17 @@ export function openEditorSettingsModal() {
 	cy.get( '.coblocks-settings-modal input[type="checkbox"]' ).should( 'have.length', 6 );
 }
 
+/**
+ * Open the CoBlocks Labs modal.
+ */
+export function openCoBlocksLabsModal() {
+	// Open "more" menu.
+	cy.get( '.edit-post-more-menu button' ).click();
+	cy.get( '.components-menu-group' ).contains( 'CoBlocks Labs' ).click();
+
+	cy.get( '.components-modal__frame' ).contains( 'CoBlocks Labs' ).should( 'exist' );
+}
+
 /**
  * Helper method to convert a hex value to an RGB value
  *

.dev/tests/jest/assets-transformer.js

@@ -0,0 +1,7 @@
+const path = require( 'path' );
+
+module.exports = {
+	process( src, filename ) {
+		return 'module.exports = ' + JSON.stringify( path.basename( filename ) ) + ';';
+	},
+};

.dev/tests/jest/jest.config.js

@@ -18,4 +18,8 @@ module.exports = {
 		'<rootDir>/.dev/tests/jest/setup-globals.js',
 	],
 	testMatch: [ '**/test/*.spec.js' ],
+	transform: {
+		'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+			'<rootDir>/.dev/tests/jest/assets-transformer.js',
+	},
 };

.dev/tests/jest/setup-globals.js

@@ -25,3 +25,247 @@ global.coblocksLayoutSelector = {
 	categories: [],
 	layouts: [],
 };
+
+// Mock site design state for tests.
+const siteDesignURLBase = 'http://localhost:8889';
+// Disable reason: sorting keys for this object is superfluous.
+/* eslint-disable sort-keys */
+global.siteDesign = {
+	availableDesignStyles: {
+		traditional: {
+			slug: 'traditional',
+			label: 'Traditional',
+			url: `${ siteDesignURLBase }/wp-content/themes/go/dist/css/design-styles/style-traditional.css`,
+			editor_style: 'dist/css/design-styles/style-traditional-editor.css',
+			color_schemes: {
+				one: {
+					label: 'Apricot',
+					primary: '#c76919',
+					secondary: '#122538',
+					tertiary: '#f8f8f8',
+					background: '#ffffff',
+				},
+				two: {
+					label: 'Emerald',
+					primary: '#165153',
+					secondary: '#212121',
+					tertiary: '#f3f1f0',
+					background: '#ffffff',
+				},
+				three: {
+					label: 'Brick',
+					primary: '#87200e',
+					secondary: '#242611',
+					tertiary: '#f9f2ef',
+					background: '#ffffff',
+				},
+				four: {
+					label: 'Bronze',
+					primary: '#a88548',
+					secondary: '#05212d',
+					tertiary: '#f9f4ef',
+					background: '#ffffff',
+				},
+			},
+			fonts: {
+				'Crimson Text': [
+					'400',
+					'400i',
+					'700',
+					'700i',
+				],
+				'Nunito Sans': [
+					'400',
+					'400i',
+					'600',
+					'700',
+				],
+			},
+			font_size: '1.05rem',
+			type_ratio: '1.275',
+			viewport_basis: '900',
+		},
+		modern: {
+			slug: 'modern',
+			label: 'Modern',
+			url: `${ siteDesignURLBase }/wp-content/themes/go/dist/css/design-styles/style-modern.css`,
+			editor_style: 'dist/css/design-styles/style-modern-editor.css',
+			color_schemes: {
+				one: {
+					label: 'Shade',
+					primary: '#000000',
+					secondary: '#455a64',
+					tertiary: '#eceff1',
+					background: '#ffffff',
+				},
+				two: {
+					label: 'Blush',
+					primary: '#c2185b',
+					secondary: '#ec407a',
+					tertiary: '#fce4ec',
+					background: '#ffffff',
+				},
+				three: {
+					label: 'Indigo',
+					primary: '#303f9f',
+					secondary: '#5c6bc0',
+					tertiary: '#e8eaf6',
+					background: '#ffffff',
+				},
+				four: {
+					label: 'Pacific',
+					primary: '#00796b',
+					secondary: '#26a69a',
+					tertiary: '#e0f2f1',
+					background: '#ffffff',
+				},
+			},
+			fonts: {
+				Heebo: [
+					'800',
+					'400',
+				],
+				'Fira Code': [
+					'400',
+					'400i',
+					'700',
+				],
+				Montserrat: [
+					'400',
+					'700',
+				],
+			},
+			font_size: '0.85rem',
+			type_ratio: '1.3',
+			viewport_basis: '950',
+		},
+	},
+	currentColorScheme: 'one',
+	currentColors: {
+		background: '#ffffff',
+		primary: '#c76919',
+		secondary: '#122538',
+		tertiary: '#f8f8f8',
+	},
+	currentDesignStyle: 'traditional',
+	currentFonts: {
+		Poppins: [
+			'600',
+		],
+		Quicksand: [
+			'400',
+			'600',
+		],
+	},
+	editorClass: 'editor-styles-wrapper',
+	fontSize: '1rem',
+	fonts: [
+		{
+			'Crimson Text': [
+				'400',
+				'400i',
+				'700',
+				'700i',
+			],
+			'Nunito Sans': [
+				'400',
+				'400i',
+				'600',
+				'700',
+			],
+		},
+		{
+			'Fira Code': [
+				'400',
+				'400i',
+				'700',
+			],
+			Heebo: [
+				'800',
+				'400',
+			],
+			Montserrat: [
+				'400',
+				'700',
+			],
+		},
+		{
+			'Noto Sans': [
+				'400',
+				'400i',
+				'700',
+			],
+			'Source Code Pro': [
+				'400',
+				'700',
+			],
+			Trocchi: [
+				'400',
+				'600',
+			],
+		},
+		{
+			Karla: [
+				'400',
+				'400i',
+				'700',
+			],
+			'Work Sans': [
+				'300',
+				'700',
+			],
+		},
+		{
+			Poppins: [
+				'600',
+			],
+			Quicksand: [
+				'400',
+				'600',
+			],
+		},
+		{
+			Cardo: [
+				'700',
+			],
+			Roboto: [
+				'400',
+			],
+		},
+		{
+			Vollkorn: [
+				'400',
+			],
+			'Yeseva One': [
+				'400',
+			],
+		},
+		{
+			Anton: [
+				'400',
+			],
+			'IBM Plex Sans': [
+				'400',
+			],
+		},
+		{
+			'IBM Plex Mono_body': [
+				'400',
+			],
+			'IBM Plex Mono_heading': [
+				'600',
+				'400',
+			],
+		},
+		{
+			'Open Sans': [
+				'400',
+			],
+			Recursive: [
+				'900',
+			],
+		},
+	],
+};
+
+global.coblocksLabs = true;

.dev/tests/phpunit/test-class-coblocks.php

@@ -69,7 +69,7 @@ public function test_constants() {
 		$reflection_method->invoke( coblocks() );
 
 		$expected = [
-			'version' => '2.22.10',
+			'version' => '2.22.11',
 			'plugin_dir'  => str_replace( '.dev/tests/phpunit/', '', plugin_dir_path( __FILE__ ) ),
 			'plugin_url'  => str_replace( '.dev/tests/phpunit/', '', plugin_dir_url( __FILE__ ) ),
 			'plugin_file' => str_replace( '.dev/tests/phpunit/test-class-coblocks.php', 'class-coblocks.php', __FILE__ ),

changelog.txt

@@ -1,4 +1,15 @@
 
+2.22.11 / 2022-04-26
+====================
+### Bug fixes
+* Fix Events block to handle multi-day events [#2353](https://github.com/godaddy-wordpress/coblocks/pull/2353)
+* Fix links in Gist block [#2349](https://github.com/godaddy-wordpress/coblocks/pull/2349)
+
+### Misc
+* Update dependencies [#2363](https://github.com/godaddy-wordpress/coblocks/pull/2363), [#2359](https://github.com/godaddy-wordpress/coblocks/pull/2359),
+  [#2358](https://github.com/godaddy-wordpress/coblocks/pull/2358) and [#2356](https://github.com/godaddy-wordpress/coblocks/pull/2356)
+* Introduce GoDaddy global styles [#2357](https://github.com/godaddy-wordpress/coblocks/pull/2357)
+
 2.22.10 / 2022-04-08
 ====================
 ### Bug fixes