- { code || __( 'unknown', 'amp' ) }
-
-
- );
-};
-
-ValidationErrorMessage.propTypes = {
- message: PropTypes.string,
- title: PropTypes.string,
- code: PropTypes.string,
-};
-
-export default ValidationErrorMessage;
diff --git a/assets/src/block-validation/components/validation-error-message/test/__snapshots__/index.js.snap b/assets/src/block-validation/components/validation-error-message/test/__snapshots__/index.js.snap
deleted file mode 100644
index b863e11570b..00000000000
--- a/assets/src/block-validation/components/validation-error-message/test/__snapshots__/index.js.snap
+++ /dev/null
@@ -1,30 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ValidationErrorMessage renders an error for a custom error code 1`] = `
-Array [
- "Error code: ",
-
- some_other_error
- ,
-]
-`;
-
-exports[`ValidationErrorMessage renders an error with a title 1`] = `
-
- Invalid attribute
-
- onclick
-
-
-`;
-
-exports[`ValidationErrorMessage renders an error for an unknown error code 1`] = `
-Array [
- "Error code: ",
-
- unknown
- ,
-]
-`;
-
-exports[`ValidationErrorMessage renders an error with a custom message 1`] = `null`;
diff --git a/assets/src/block-validation/components/validation-error-message/test/index.js b/assets/src/block-validation/components/validation-error-message/test/index.js
deleted file mode 100644
index db90e62fbba..00000000000
--- a/assets/src/block-validation/components/validation-error-message/test/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * External dependencies
- */
-import { render } from 'enzyme';
-
-/**
- * Internal dependencies
- */
-import ValidationErrorMessage from '../';
-
-describe( 'ValidationErrorMessage', () => {
- it( 'renders an error with a custom message', () => {
- const errorMessage = render( + { __( 'This error comes from outside the post content.', 'amp' ) } +
+ ) } +jquery.js',
+ error: {
+ type: 'js_error',
+ sources: [],
+ },
+ },
+ {
+ clientId: themeBlock.clientId,
+ code: 'DISALLOWED_TAG',
+ status: 3,
+ term_id: 12,
+ title: 'Invalid script: jquery.js',
+ error: {
+ type: 'js_error',
+ },
+ },
+ {
+ clientId: coreBlock.clientId,
+ code: 'DISALLOWED_TAG',
+ status: 3,
+ term_id: 12,
+ title: 'Invalid script: jquery.js',
+ error: {
+ type: 'js_error',
+ sources: [],
+ },
+ },
+ {
+ clientId: unknownBlock.clientId,
+ code: 'DISALLOWED_TAG',
+ status: 3,
+ term_id: 12,
+ title: 'Invalid script: jquery.js',
+ error: {
+ type: 'js_error',
+ sources: [],
+ },
+ },
+ ],
+ } );
+}
+
+function getTestBlock( type ) {
+ switch ( type ) {
+ case 'plugin':
+ return pluginBlock;
+
+ case 'theme':
+ return themeBlock;
+
+ case 'core':
+ return coreBlock;
+
+ case 'unknown':
+ return unknownBlock;
+
+ default:
+ return null;
+ }
+}
+
+describe( 'Error', () => {
+ beforeAll( () => {
+ createTestStoreAndBlocks();
+ } );
+
+ beforeEach( () => {
+ container = document.createElement( 'ul' );
+ document.body.appendChild( container );
+ } );
+
+ afterEach( () => {
+ document.body.removeChild( container );
+ container = null;
+ } );
+
+ it.each( [
+ VALIDATION_ERROR_ACK_ACCEPTED_STATUS,
+ VALIDATION_ERROR_ACK_REJECTED_STATUS,
+ VALIDATION_ERROR_NEW_ACCEPTED_STATUS,
+ VALIDATION_ERROR_NEW_REJECTED_STATUS,
+ ].map( ( status ) => [
+ status,
+ () => (
+
+ { reviewLink && (
+
+ { __( 'Validation issues will be checked for when the post is saved.', 'amp' ) } +
++ { __( 'There are no AMP validation issues.', 'amp' ) } +
++ { __( 'All AMP validation issues have been reviewed.', 'amp' ) } +
+jquery.js',
+ error: {
+ node_name: 'script',
+ parent_name: 'head',
+ code: 'DISALLOWED_TAG',
+ type: 'js_error',
+ node_attributes: {
+ src: 'https://test.site/wp-includes/js/jquery/jquery.js?ver=__normalized__',
+ id: 'jquery-core-js',
+ },
+ node_type: 1,
+ sources: [],
+ },
+ status: 3,
+ term_status: 3,
+ forced: false,
+ term_id: 12,
+ },
+ {
+ sanitized: false,
+ title: 'Invalid attribute: bad-attr',
+ error: {
+ code: 'DISALLOWED_ATTR',
+ element_attributes: {
+ 'bad-attr': 'bad-attr',
+ },
+ node_name: 'bad-attr',
+ parent_name: 'div',
+ type: 'html_attribute_error',
+ node_type: 2,
+ sources: [
+ {
+ hook: 'the_content',
+ filter: true,
+ post_id: 1,
+ post_type: 'post',
+ sources: [],
+ },
+ {
+ block_name: 'core/html',
+ post_id: 1,
+ block_content_index: 1,
+ },
+ ],
+ },
+ status: 1,
+ term_status: 1,
+ forced: false,
+ term_id: 27,
+ },
+ {
+ sanitized: false,
+ title: 'Invalid element: <bad-element>',
+ error: {
+ node_name: 'bad-element',
+ parent_name: 'div',
+ code: 'DISALLOWED_TAG',
+ type: 'html_element_error',
+ node_attributes: [],
+ node_type: 1,
+ sources: [
+ {
+ hook: 'the_content',
+ filter: true,
+ post_id: 1,
+ post_type: 'post',
+ sources: [],
+ },
+ {
+ block_name: 'core/html',
+ post_id: 1,
+ block_content_index: 2,
+ },
+ ],
+ },
+ status: 1,
+ term_status: 1,
+ forced: false,
+ term_id: 28,
+ },
+ {
+ sanitized: false,
+ title: 'Invalid inline script',
+ error: {
+ node_name: 'script',
+ parent_name: 'p',
+ code: 'DISALLOWED_TAG',
+ type: 'js_error',
+ node_attributes: [],
+ text: "alert('danger');",
+ node_type: 1,
+ sources: [
+ {
+ hook: 'the_content',
+ filter: true,
+ post_id: 1,
+ post_type: 'post',
+ sources: [],
+ },
+ {
+ block_name: 'core/html',
+ post_id: 1,
+ block_content_index: 3,
+ },
+ ],
+ },
+ status: 1,
+ term_status: 1,
+ forced: false,
+ term_id: 29,
+ },
+ {
+ sanitized: false,
+ title: 'Invalid inline script',
+ error: {
+ node_name: 'script',
+ parent_name: 'div',
+ code: 'DISALLOWED_TAG',
+ type: 'js_error',
+ node_attributes: {
+ class: 'wp-block-bad-blocks-script',
+ },
+ text: 'alert("hello")',
+ node_type: 1,
+ sources: [
+ {
+ hook: 'the_content',
+ filter: true,
+ post_id: 1,
+ post_type: 'post',
+ sources: [],
+ },
+ {
+ block_name: 'bad-blocks/script',
+ post_id: 1,
+ block_content_index: 10,
+ },
+ ],
+ },
+ status: 1,
+ term_status: 1,
+ forced: false,
+ term_id: 33,
+ },
+ {
+ sanitized: false,
+ title: 'Invalid element: <unknown-element>',
+ error: {
+ node_name: 'unknown-element',
+ parent_name: 'div',
+ code: 'DISALLOWED_TAG',
+ type: 'html_element_error',
+ node_attributes: {
+ class: 'wp-block-bad-blocks-unknown-element',
+ },
+ node_type: 1,
+ sources: [
+ {
+ hook: 'the_content',
+ filter: true,
+ post_id: 1,
+ post_type: 'post',
+ sources: [],
+ },
+ {
+ block_name: 'bad-blocks/unknown-element',
+ post_id: 1,
+ block_content_index: 11,
+ },
+ ],
+ },
+ status: 1,
+ term_status: 1,
+ forced: false,
+ term_id: 34,
+ },
+ {
+ sanitized: false,
+ title: 'Invalid inline script',
+ error: {
+ node_name: 'script',
+ parent_name: 'body',
+ code: 'DISALLOWED_TAG',
+ type: 'js_error',
+ node_attributes: [],
+ text: "\n\t\t( function ( body ) {\n\t\t\t'use strict';\n\t\t\tbody.className = body.className.replace( /\\bTest-no-js\\b/, 'Test-js' );\n\t\t} )( document.body );\n\t\t",
+ node_type: 1,
+ sources: [
+ {
+ type: 'plugin',
+ name: 'the-test-calendar',
+ file: 'common/src/Test/Main.php',
+ line: 401,
+ function: 'Test__Main::toggle_js_class',
+ hook: 'wp_footer',
+ priority: 10,
+ },
+ ],
+ },
+ status: 2,
+ term_status: 2,
+ forced: false,
+ term_id: 10,
+ },
+ {
+ sanitized: true,
+ title: 'Invalid inline script',
+ error: {
+ node_name: 'script',
+ parent_name: 'body',
+ code: 'DISALLOWED_TAG',
+ type: 'js_error',
+ node_attributes: [],
+ text: ' /* */ ',
+ node_type: 1,
+ sources: [
+ {
+ type: 'plugin',
+ name: 'the-test-calendar',
+ file: 'common/src/Test/Asset/Data.php',
+ line: 54,
+ function: 'Test__Asset__Data::render_json',
+ hook: 'wp_footer',
+ priority: 10,
+ },
+ ],
+ },
+ status: 3,
+ term_status: 3,
+ forced: false,
+ term_id: 11,
+ },
+];
diff --git a/assets/src/block-validation/test/add-toolbar-button-to-block.js b/assets/src/block-validation/test/add-toolbar-button-to-block.js
new file mode 100644
index 00000000000..769ee2c1c7e
--- /dev/null
+++ b/assets/src/block-validation/test/add-toolbar-button-to-block.js
@@ -0,0 +1,195 @@
+/**
+ * External dependencies
+ */
+import { act } from 'react-dom/test-utils';
+import { noop } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { Component, render } from '@wordpress/element';
+import { dispatch } from '@wordpress/data';
+import { registerBlockType, createBlock } from '@wordpress/blocks';
+import '@wordpress/block-editor'; // Block editor data store needed.
+
+/**
+ * Internal dependencies
+ */
+import { createStore } from '../store';
+import { withAMPToolbarButton } from '../with-amp-toolbar-button';
+
+let container, block;
+let toolbarButtonWasRendered = false;
+
+const TEST_BLOCK = 'my-plugin/test-block';
+
+jest.mock( '../amp-toolbar-button', () => ( {
+ AMPToolbarButton() {
+ toolbarButtonWasRendered = true;
+
+ return null;
+ } } ) );
+
+registerBlockType( TEST_BLOCK, {
+ attributes: {},
+ save: noop,
+ category: 'widgets',
+ title: 'test block',
+} );
+
+describe( 'withAMPToolbarButton: filtering with errors', () => {
+ beforeAll( () => {
+ block = createBlock( TEST_BLOCK, {} );
+ dispatch( 'core/block-editor' ).insertBlock( block );
+
+ createStore( {
+ reviewLink: 'http://review-link.test',
+ unreviewedValidationErrors: [
+ {
+ clientId: block.clientId,
+ code: 'DISALLOWED_TAG',
+ status: 3,
+ term_id: 12,
+ title: 'Invalid script: jquery.js',
+ type: 'js_error',
+ },
+ ],
+ validationErrors: [
+ {
+ clientId: block.clientId,
+ code: 'DISALLOWED_TAG',
+ status: 3,
+ term_id: 12,
+ title: 'Invalid script: jquery.js',
+ type: 'js_error',
+ },
+ ],
+ } );
+ } );
+
+ beforeEach( () => {
+ container = document.createElement( 'ul' );
+ document.body.appendChild( container );
+ toolbarButtonWasRendered = false;
+ } );
+
+ afterEach( () => {
+ document.body.removeChild( container );
+ container = null;
+ } );
+
+ it( 'is filtered correctly with a class component', () => {
+ class UnfilteredComponent extends Component {
+ render() {
+ return (
+