Skip to content

Commit 46388e7

Browse files
committed
Merge branch 'trunk' into collaboration/table-awareness-object-cache
2 parents e25b9c9 + b95a327 commit 46388e7

5 files changed

Lines changed: 38 additions & 104 deletions

File tree

src/wp-admin/css/forms.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,11 @@ input[type="number"].tiny-text {
583583
vertical-align: middle;
584584
}
585585

586+
.button.wp-hide-pw.user-new-password-toggle > .dashicons {
587+
line-height: 1.85;
588+
vertical-align: top;
589+
}
590+
586591
.wp-cancel-pw .dashicons-no {
587592
display: none;
588593
}

src/wp-admin/user-edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@
695695
<input type="password" name="pass1" id="pass1" class="regular-text ltr" value="" autocomplete="new-password" spellcheck="false" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
696696
<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
697697
</div>
698-
<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
698+
<button type="button" class="button wp-hide-pw user-new-password-toggle hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
699699
<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
700700
<span class="text"><?php _e( 'Hide' ); ?></span>
701701
</button>

tests/phpunit/tests/blocks/registerBlockTypeFromMetadataWithRegistry.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Tests for WP_Block_Metadata_Registry integration with register_block_type_from_metadata().
44
*
55
* @group blocks
6+
*
7+
* @covers ::register_block_type_from_metadata
68
*/
79
class Tests_Blocks_RegisterBlockTypeFromMetadataWithRegistry extends WP_UnitTestCase {
810
private $temp_manifest_file;

tests/phpunit/tests/blocks/wpBlockParser.php

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* @since 5.0.0
88
*
99
* @group blocks
10+
*
11+
* @coversDefaultClass WP_Block_Parser
1012
*/
1113
class Tests_Blocks_wpBlockParser extends WP_UnitTestCase {
1214
/**
@@ -17,35 +19,11 @@ class Tests_Blocks_wpBlockParser extends WP_UnitTestCase {
1719
*/
1820
protected static $fixtures_dir;
1921

20-
/**
21-
* @ticket 45109
22-
*/
23-
public function data_parsing_test_filenames() {
24-
self::$fixtures_dir = DIR_TESTDATA . '/blocks/fixtures';
25-
26-
$fixture_filenames = array_merge(
27-
glob( self::$fixtures_dir . '/*.json' ),
28-
glob( self::$fixtures_dir . '/*.html' )
29-
);
30-
31-
$fixture_filenames = array_values(
32-
array_unique(
33-
array_map(
34-
array( $this, 'clean_fixture_filename' ),
35-
$fixture_filenames
36-
)
37-
)
38-
);
39-
40-
return array_map(
41-
array( $this, 'pass_parser_fixture_filenames' ),
42-
$fixture_filenames
43-
);
44-
}
45-
4622
/**
4723
* @dataProvider data_parsing_test_filenames
4824
* @ticket 45109
25+
*
26+
* @covers ::parse
4927
*/
5028
public function test_default_parser_output( $html_filename, $parsed_json_filename ) {
5129
$html_path = self::$fixtures_dir . '/' . $html_filename;
@@ -70,6 +48,32 @@ public function test_default_parser_output( $html_filename, $parsed_json_filenam
7048
);
7149
}
7250

51+
/**
52+
* @ticket 45109
53+
*/
54+
public function data_parsing_test_filenames() {
55+
self::$fixtures_dir = DIR_TESTDATA . '/blocks/fixtures';
56+
57+
$fixture_filenames = array_merge(
58+
glob( self::$fixtures_dir . '/*.json' ),
59+
glob( self::$fixtures_dir . '/*.html' )
60+
);
61+
62+
$fixture_filenames = array_values(
63+
array_unique(
64+
array_map(
65+
array( $this, 'clean_fixture_filename' ),
66+
$fixture_filenames
67+
)
68+
)
69+
);
70+
71+
return array_map(
72+
array( $this, 'pass_parser_fixture_filenames' ),
73+
$fixture_filenames
74+
);
75+
}
76+
7377
/**
7478
* Helper function to remove relative paths and extension from a filename, leaving just the fixture name.
7579
*

0 commit comments

Comments
 (0)