Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion includes/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,8 @@ protected function get_registered_options(): array {
$default_schema = [
'type' => empty( $args['type'] ) ? null : $args['type'],
'description' => empty( $args['description'] ) ? '' : $args['description'],
'default' => $args['default'],
// @phpstan-ignore nullCoalesce.unnecessary (False positive)
'default' => $args['default'] ?? null,
];

$schema = array_merge( $default_schema, $rest_args['schema'] );
Expand Down
5 changes: 4 additions & 1 deletion packages/e2e-test-utils/src/trashAllTerms.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ async function trashAllTerms(taxonomy) {
await visitAdminPage('edit-tags.php', `taxonomy=${taxonomy}`);

// If this selector doesn't exist there are no terms for us to delete.
const bulkSelector = await page.$('#bulk-action-selector-top');
// The .hidden class is a new addition in WP 7.1, see http://core.trac.wordpress.org/ticket/63372.
const bulkSelector = await page.$(
'.bulkactions:not(.hidden) #bulk-action-selector-top'
);
if (bulkSelector) {
await page.waitForSelector('[id^=cb-select-all-]');
await page.click('[id^=cb-select-all-]');
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/src/specs/wordpress/archive.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ describe('Stories Archive', () => {
await expect(page).toClick('button span', { text: 'Web Stories' });

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

await expect(page).toClick('button', { text: 'Latest Stories' });
await expect(page).toClick('button', { text: 'Box Carousel' });
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/src/specs/wordpress/blockWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ describe('Web Stories Widget Block', () => {
await expect(page).toClick('button span', { text: 'Web Stories' });

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

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

Expand Down
Loading