Skip to content

Commit dc457fa

Browse files
rodica-andronacherodica-andronache
authored
Merge pull request #756 from contactashish13/issue-755
Cypress: Gutenberg tests fail/crash on WP 5.5
2 parents c906a65 + 29f22d6 commit dc457fa

File tree

6 files changed

+34
-22
lines changed

6 files changed

+34
-22
lines changed

‎bin/wp-init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ docker exec $args visualizer_wordpress wp --allow-root core install --url="http:
2323
# update core
2424
docker exec $args visualizer_wordpress chown -R www-data:www-data /var/www/html/
2525
docker exec $args visualizer_wordpress chmod 0777 -R /var/www/html/wp-content
26-
docker exec $args visualizer_wordpress wp --allow-root core update --version=5.4
26+
docker exec $args visualizer_wordpress wp --allow-root core update --version=5.5
2727
docker exec $args visualizer_wordpress wp --allow-root core update-db
2828

2929
# install required external plugins

‎classes/Visualizer/Gutenberg/build/block.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎classes/Visualizer/Gutenberg/src/Components/ChartSelect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class ChartSelect extends Component {
147147
</InspectorControls>
148148
}
149149

150-
<div className="visualizer-settings__chart">
150+
<div className="visualizer-settings__chart" data-chart-type={ chart }>
151151

152152
{ ( null !== this.props.chart ) &&
153153

‎classes/Visualizer/Gutenberg/src/Components/Charts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class Charts extends Component {
132132
}
133133

134134
return (
135-
<div className="visualizer-settings__charts-single" key={ `chart-${ charts[i].id }` }>
135+
<div className="visualizer-settings__charts-single" data-chart-type={ chart }> key={ `chart-${ charts[i].id }` }>
136136

137137
<div className="visualizer-settings__charts-title">
138138
{ title }

‎cypress/integration/free-gutenberg-datatable.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ describe('Test Free - gutenberg (datatable)', function() {
2727

2828
cy.wrap(charts).each((value, i, array) => {
2929
// insert a visualizer block
30-
cy.get('div.edit-post-header-toolbar .block-editor-inserter button').click();
31-
cy.get('.components-popover__content').then(function ($popup) {
32-
cy.wrap($popup).find('.block-editor-inserter__search').type('visua');
33-
cy.wrap($popup).find('.block-editor-inserter__results ul.block-editor-block-types-list li').should('have.length', 1);
34-
cy.wrap($popup).find('.block-editor-inserter__results ul.block-editor-block-types-list li button').click();
30+
cy.get('div.edit-post-header-toolbar button.edit-post-header-toolbar__inserter-toggle').click();
31+
cy.get('.edit-post-layout__inserter-panel-popover-wrapper').then(function ($popup) {
32+
cy.wrap($popup).find('.block-editor-inserter__search-input').type('visua');
33+
cy.wrap($popup).find('.block-editor-inserter__block-list .block-editor-block-types-list__list-item').should('have.length', 1);
34+
cy.wrap($popup).find('.block-editor-inserter__block-list button.editor-block-list-item-visualizer-chart').click();
3535
});
3636

3737
// see the block has the correct elements.
38-
cy.get('div[data-type="visualizer/chart"]').should('have.length', (i + 2));
38+
cy.get('div[data-type="visualizer/chart"]').should('have.length', (i + 1));
3939

4040
cy.get('div[data-type="visualizer/chart"]:nth-child(' + (i + 1) + ')').then( ($block) => {
4141
// 2 rows - create and insert
@@ -45,8 +45,11 @@ describe('Test Free - gutenberg (datatable)', function() {
4545
cy.wrap($block).find('.visualizer-settings__content-option').last().click({force:true});
4646

4747
// insert chart
48+
cy.wrap($block).find('.visualizer-settings .visualizer-settings__charts-single:nth-child(' + (i + 1) + ')').then( ($chart_block) => {
49+
cy.log('Inserting chart: ' + Cypress.$($chart_block).attr('data-chart-type'));
50+
});
4851
cy.wrap($block).find('.visualizer-settings .visualizer-settings__charts-single:nth-child(' + (i + 1) + ') .visualizer-settings__charts-controls').click();
49-
52+
5053
cy.wrap($block).find('.visualizer-settings .visualizer-settings__chart').should('have.length', 1);
5154

5255
// log a line to show which chart we are trying to insert.
@@ -61,7 +64,10 @@ describe('Test Free - gutenberg (datatable)', function() {
6164
cy.wrap($block).find('.visualizer-settings .components-button-group button').should('have.length', 2);
6265
cy.wrap($block).find('.visualizer-settings .components-button-group button.visualizer-bttn-done').should('have.length', 1);
6366

64-
// click advanced options
67+
// make the settings block appear.
68+
cy.wrap($block).type('{ctrl}{shift},');
69+
70+
// click advanced options.
6571
cy.get('.visualizer-advanced-options button.components-button').click({force:true});
6672

6773
// done button disappears, save button appears
@@ -74,4 +80,4 @@ describe('Test Free - gutenberg (datatable)', function() {
7480
});
7581
});
7682

77-
})
83+
})

‎cypress/integration/free-gutenberg.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ describe('Test Free - gutenberg', function() {
2727

2828
cy.wrap(charts).each((value, i, array) => {
2929
// insert a visualizer block
30-
cy.get('div.edit-post-header-toolbar .block-editor-inserter button').click();
31-
cy.get('.components-popover__content').then(function ($popup) {
32-
cy.wrap($popup).find('.block-editor-inserter__search').type('visua');
33-
cy.wrap($popup).find('.block-editor-inserter__results ul.block-editor-block-types-list li').should('have.length', 1);
34-
cy.wrap($popup).find('.block-editor-inserter__results ul.block-editor-block-types-list li button').click();
30+
cy.get('div.edit-post-header-toolbar button.edit-post-header-toolbar__inserter-toggle').click();
31+
cy.get('.edit-post-layout__inserter-panel-popover-wrapper').then(function ($popup) {
32+
cy.wrap($popup).find('.block-editor-inserter__search-input').type('visua');
33+
cy.wrap($popup).find('.block-editor-inserter__block-list .block-editor-block-types-list__list-item').should('have.length', 1);
34+
cy.wrap($popup).find('.block-editor-inserter__block-list button.editor-block-list-item-visualizer-chart').click();
3535
});
3636

3737
// see the block has the correct elements.
38-
cy.get('div[data-type="visualizer/chart"]').should('have.length', (i + 2));
38+
cy.get('div[data-type="visualizer/chart"]').should('have.length', (i + 1));
3939

4040
cy.get('div[data-type="visualizer/chart"]:nth-child(' + (i + 1) + ')').then( ($block) => {
4141
// 2 rows - create and insert
@@ -45,8 +45,11 @@ describe('Test Free - gutenberg', function() {
4545
cy.wrap($block).find('.visualizer-settings__content-option').last().click({force:true});
4646

4747
// insert chart
48+
cy.wrap($block).find('.visualizer-settings .visualizer-settings__charts-single:nth-child(' + (i + 1) + ')').then( ($chart_block) => {
49+
cy.log('Inserting chart: ' + Cypress.$($chart_block).attr('data-chart-type'));
50+
});
4851
cy.wrap($block).find('.visualizer-settings .visualizer-settings__charts-single:nth-child(' + (i + 1) + ') .visualizer-settings__charts-controls').click();
49-
52+
5053
cy.wrap($block).find('.visualizer-settings .visualizer-settings__chart').should('have.length', 1);
5154

5255
// log a line to show which chart we are trying to insert.
@@ -61,7 +64,10 @@ describe('Test Free - gutenberg', function() {
6164
cy.wrap($block).find('.visualizer-settings .components-button-group button').should('have.length', 2);
6265
cy.wrap($block).find('.visualizer-settings .components-button-group button.visualizer-bttn-done').should('have.length', 1);
6366

64-
// click advanced options
67+
// make the settings block appear.
68+
cy.wrap($block).type('{ctrl}{shift},');
69+
70+
// click advanced options.
6571
cy.get('.visualizer-advanced-options button.components-button').click({force:true});
6672

6773
// done button disappears, save button appears

0 commit comments

Comments
 (0)