Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a block fixtures framework to allow automated checking of block validation #18643

Merged
merged 12 commits into from
Feb 17, 2021
Merged

Add a block fixtures framework to allow automated checking of block validation #18643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7edb346
Add additional block structure fixture
Feb 17, 2021
c64b855
Add task to generate fixtures
Feb 10, 2021
118ef91
Remove test files
Feb 1, 2021
b27b709
Add in handling of deprecations
Feb 1, 2021
c2dc996
Remove unused import
Feb 1, 2021
04bc995
Tidy up and add readme
Feb 1, 2021
6b90fef
Centralise the block registration
Feb 1, 2021
7b1f168
Fix readme error
Feb 2, 2021
c22f02d
Remove unused method
Feb 2, 2021
88a1b95
remove unused dependency
Feb 17, 2021
280a2df
remove cross-env dependency
Feb 10, 2021
3bb5e46
Add test script to run just validation tests and update readme
Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ensions/blocks/send-a-message/whatsapp-button/test/fixtures/jetpack__whatsapp-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:jetpack/send-a-message -->
<div class="wp-block-jetpack-send-a-message"><!-- wp:jetpack/whatsapp-button {"countryCode":"61CX","phoneNumber":"267 8888","firstMessage":"My Message"} -->
<div class="wp-block-jetpack-whatsapp-button is-color-dark"><a class="whatsapp-block__button" href="https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message" style="background-color:#25D366;color:#fff" target="_self" rel="noopener noreferrer">Chat on WhatsApp</a></div>
<!-- /wp:jetpack/whatsapp-button --></div>
<!-- /wp:jetpack/send-a-message -->
29 changes: 29 additions & 0 deletions ...ensions/blocks/send-a-message/whatsapp-button/test/fixtures/jetpack__whatsapp-button.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[
{
"clientId": "_clientId_0",
"name": "jetpack/send-a-message",
"isValid": true,
"attributes": {},
"innerBlocks": [
{
"clientId": "_clientId_0",
"name": "jetpack/whatsapp-button",
"isValid": true,
"attributes": {
"countryCode": "61CX",
"phoneNumber": "267 8888",
"firstMessage": "My Message",
"buttonText": [
"Chat on WhatsApp"
],
"backgroundColor": "#25D366",
"colorClass": "dark",
"openInNewTab": false
},
"innerBlocks": [],
"originalContent": "<div class=\"wp-block-jetpack-whatsapp-button is-color-dark\"><a class=\"whatsapp-block__button\" href=\"https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message\" style=\"background-color:#25D366;color:#fff\" target=\"_self\" rel=\"noopener noreferrer\">Chat on WhatsApp</a></div>"
}
],
"originalContent": "<div class=\"wp-block-jetpack-send-a-message\"></div>"
}
]
36 changes: 36 additions & 0 deletions .../blocks/send-a-message/whatsapp-button/test/fixtures/jetpack__whatsapp-button.parsed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[
{
"blockName": "jetpack/send-a-message",
"attrs": {},
"innerBlocks": [
{
"blockName": "jetpack/whatsapp-button",
"attrs": {
"countryCode": "61CX",
"phoneNumber": "267 8888",
"firstMessage": "My Message"
},
"innerBlocks": [],
"innerHTML": "\n\t<div class=\"wp-block-jetpack-whatsapp-button is-color-dark\"><a class=\"whatsapp-block__button\" href=\"https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message\" style=\"background-color:#25D366;color:#fff\" target=\"_self\" rel=\"noopener noreferrer\">Chat on WhatsApp</a></div>\n\t",
"innerContent": [
"\n\t<div class=\"wp-block-jetpack-whatsapp-button is-color-dark\"><a class=\"whatsapp-block__button\" href=\"https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message\" style=\"background-color:#25D366;color:#fff\" target=\"_self\" rel=\"noopener noreferrer\">Chat on WhatsApp</a></div>\n\t"
]
}
],
"innerHTML": "\n<div class=\"wp-block-jetpack-send-a-message\"></div>\n\t",
"innerContent": [
"\n<div class=\"wp-block-jetpack-send-a-message\">",
null,
"</div>\n\t"
]
},
{
"blockName": null,
"attrs": {},
"innerBlocks": [],
"innerHTML": "\n",
"innerContent": [
"\n"
]
}
]
5 changes: 5 additions & 0 deletions ...cks/send-a-message/whatsapp-button/test/fixtures/jetpack__whatsapp-button.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:jetpack/send-a-message -->
<div class="wp-block-jetpack-send-a-message"><!-- wp:jetpack/whatsapp-button {"countryCode":"61CX","phoneNumber":"267 8888","firstMessage":"My Message"} -->
<div class="wp-block-jetpack-whatsapp-button is-color-dark"><a class="whatsapp-block__button" href="https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message" style="background-color:#25D366;color:#fff" target="_self" rel="noopener noreferrer">Chat on WhatsApp</a></div>
<!-- /wp:jetpack/whatsapp-button --></div>
<!-- /wp:jetpack/send-a-message -->
5 changes: 5 additions & 0 deletions .../send-a-message/whatsapp-button/test/fixtures/jetpack__whatsapp-button__deprecated-1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:jetpack/send-a-message -->
<div class="wp-block-jetpack-send-a-message"><!-- wp:jetpack/whatsapp-button {"countryCode":"61CX","phoneNumber":"267 8888","firstMessage":"My Message"} -->
<div class="wp-block-jetpack-whatsapp-button is-color-dark"><a class="whatsapp-block__button" href="https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message" style="background-color:#25D366;" target="_self" rel="noopener noreferrer">Chat on WhatsApp</a></div>
<!-- /wp:jetpack/whatsapp-button --></div>
<!-- /wp:jetpack/send-a-message -->
29 changes: 29 additions & 0 deletions .../send-a-message/whatsapp-button/test/fixtures/jetpack__whatsapp-button__deprecated-1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[
{
"clientId": "_clientId_0",
"name": "jetpack/send-a-message",
"isValid": true,
"attributes": {},
"innerBlocks": [
{
"clientId": "_clientId_0",
"name": "jetpack/whatsapp-button",
"isValid": true,
"attributes": {
"countryCode": "61CX",
"phoneNumber": "267 8888",
"firstMessage": "My Message",
"buttonText": [
"Chat on WhatsApp"
],
"backgroundColor": "#25D366",
"colorClass": "dark",
"openInNewTab": false
},
"innerBlocks": [],
"originalContent": "<div class=\"wp-block-jetpack-whatsapp-button is-color-dark\"><a class=\"whatsapp-block__button\" href=\"https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message\" style=\"background-color:#25D366;\" target=\"_self\" rel=\"noopener noreferrer\">Chat on WhatsApp</a></div>"
}
],
"originalContent": "<div class=\"wp-block-jetpack-send-a-message\"></div>"
}
]
36 changes: 36 additions & 0 deletions ...-message/whatsapp-button/test/fixtures/jetpack__whatsapp-button__deprecated-1.parsed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[
{
"blockName": "jetpack/send-a-message",
"attrs": {},
"innerBlocks": [
{
"blockName": "jetpack/whatsapp-button",
"attrs": {
"countryCode": "61CX",
"phoneNumber": "267 8888",
"firstMessage": "My Message"
},
"innerBlocks": [],
"innerHTML": "\n\t<div class=\"wp-block-jetpack-whatsapp-button is-color-dark\"><a class=\"whatsapp-block__button\" href=\"https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message\" style=\"background-color:#25D366;\" target=\"_self\" rel=\"noopener noreferrer\">Chat on WhatsApp</a></div>\n\t",
"innerContent": [
"\n\t<div class=\"wp-block-jetpack-whatsapp-button is-color-dark\"><a class=\"whatsapp-block__button\" href=\"https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message\" style=\"background-color:#25D366;\" target=\"_self\" rel=\"noopener noreferrer\">Chat on WhatsApp</a></div>\n\t"
]
}
],
"innerHTML": "\n<div class=\"wp-block-jetpack-send-a-message\"></div>\n\t",
"innerContent": [
"\n<div class=\"wp-block-jetpack-send-a-message\">",
null,
"</div>\n\t"
]
},
{
"blockName": null,
"attrs": {},
"innerBlocks": [],
"innerHTML": "\n",
"innerContent": [
"\n"
]
}
]
5 changes: 5 additions & 0 deletions ...sage/whatsapp-button/test/fixtures/jetpack__whatsapp-button__deprecated-1.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:jetpack/send-a-message -->
<div class="wp-block-jetpack-send-a-message"><!-- wp:jetpack/whatsapp-button {"countryCode":"61CX","phoneNumber":"267 8888","firstMessage":"My Message"} -->
<div class="wp-block-jetpack-whatsapp-button is-color-dark"><a class="whatsapp-block__button" href="https://api.whatsapp.com/send?phone=612678888&amp;text=My%20Message" style="background-color:#25D366;color:#fff" target="_self" rel="noopener noreferrer">Chat on WhatsApp</a></div>
<!-- /wp:jetpack/whatsapp-button --></div>
<!-- /wp:jetpack/send-a-message -->
15 changes: 15 additions & 0 deletions projects/plugins/jetpack/extensions/blocks/send-a-message/whatsapp-button/test/validate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Internal dependencies
*/
import { settings } from '../';
import { settings as parentSettings } from '../../';
import runBlockFixtureTests from '../../../../shared/test/block-fixtures';

// Need to include all the blocks involved in rendering this block.
// The main block should be the first in the array.
const blocks = [
{ name: 'jetpack/whatsapp-button', settings },
{ name: 'jetpack/send-a-message', settings: parentSettings },
];

runBlockFixtureTests( 'jetpack/whatsapp-button', blocks, __dirname );
Loading