Skip to content

Commit 26cb878

Browse files
authored
Fix tests for WordPress 7.1 (#14601)
1 parent bfa3930 commit 26cb878

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

includes/Settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,8 @@ protected function get_registered_options(): array {
577577
$default_schema = [
578578
'type' => empty( $args['type'] ) ? null : $args['type'],
579579
'description' => empty( $args['description'] ) ? '' : $args['description'],
580-
'default' => $args['default'],
580+
// @phpstan-ignore nullCoalesce.unnecessary (False positive)
581+
'default' => $args['default'] ?? null,
581582
];
582583

583584
$schema = array_merge( $default_schema, $rest_args['schema'] );

packages/e2e-test-utils/src/trashAllTerms.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ async function trashAllTerms(taxonomy) {
3333
await visitAdminPage('edit-tags.php', `taxonomy=${taxonomy}`);
3434

3535
// If this selector doesn't exist there are no terms for us to delete.
36-
const bulkSelector = await page.$('#bulk-action-selector-top');
36+
// The .hidden class is a new addition in WP 7.1, see http://core.trac.wordpress.org/ticket/63372.
37+
const bulkSelector = await page.$(
38+
'.bulkactions:not(.hidden) #bulk-action-selector-top'
39+
);
3740
if (bulkSelector) {
3841
await page.waitForSelector('[id^=cb-select-all-]');
3942
await page.click('[id^=cb-select-all-]');

packages/e2e-tests/src/specs/wordpress/archive.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ describe('Stories Archive', () => {
174174
await expect(page).toClick('button span', { text: 'Web Stories' });
175175

176176
await page.waitForSelector('.web-stories-block-configuration-panel');
177-
await expect(page).toClick('.web-stories-block-configuration-panel');
178177

179178
await expect(page).toClick('button', { text: 'Latest Stories' });
180179
await expect(page).toClick('button', { text: 'Box Carousel' });

packages/e2e-tests/src/specs/wordpress/blockWidget.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ describe('Web Stories Widget Block', () => {
6262
await expect(page).toClick('button span', { text: 'Web Stories' });
6363

6464
await page.waitForSelector('.web-stories-block-configuration-panel');
65-
await expect(page).toClick('.web-stories-block-configuration-panel');
6665

6766
await expect(page).toClick('button[aria-label="Embed a single story."]');
6867

0 commit comments

Comments
 (0)