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

Navigation Link: Remove unit test code for < WP 6.5 #69069

Closed
wants to merge 1 commit into from
+6 −157
Closed

Navigation Link: Remove unit test code for < WP 6.5 #69069

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
163 changes: 6 additions & 157 deletions phpunit/blocks/block-navigation-link-variations-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,77 +13,6 @@
*/
class Block_Navigation_Link_Variations_Test extends WP_UnitTestCase {

/**
* Whether to use a shim/workaround for WordPress Core versions < 6.5.
* See https://github.com/WordPress/gutenberg/pull/58389 for details.
*
* @var bool
*/
private $pre_65_compat = false;

public function set_up() {
parent::set_up();

$post_type = register_post_type(
'custom_book',
array(
'labels' => array(
'item_link' => 'Custom Book',
),
'public' => true,
'show_in_rest' => true,
'show_in_nav_menus' => true,
)
);
$private_post_type = register_post_type(
'private_custom_book',
array(
'labels' => array(
'item_link' => 'Custom Book',
),
'public' => false,
'show_in_rest' => true,
'show_in_nav_menus' => false,
)
);
$taxonomy = register_taxonomy(
'book_type',
'custom_book',
array(
'labels' => array(
'item_link' => 'Book Type',
),
'show_in_nav_menus' => true,
)
);
$private_taxonomoy = register_taxonomy(
'private_book_type',
'private_custom_book',
array(
'labels' => array(
'item_link' => 'Book Type',
),
'show_in_nav_menus' => false,
)
);

$this->pre_65_compat = ! method_exists( 'WP_Block_Type', 'get_variations' );

/*
* In Core versions < 6.5, variations for post types/taxonomies registered after init#10 (= after the block type was registered)
* need to be manually registered.
* set_up runs after init#10, therefore register the variations here with the old deprecated functions.
*
* TODO: After two WP versions (6.7), we can remove this.
*/
if ( $this->pre_65_compat ) {
$this->handle_pre_65_post_type_variation_registration( $post_type );
$this->handle_pre_65_post_type_variation_registration( $private_post_type );
$this->handle_pre_65_taxonomy_variation_registration( $taxonomy );
$this->handle_pre_65_taxonomy_variation_registration( $private_taxonomoy );
}
}

public function tear_down() {
unregister_post_type( 'custom_book' );
unregister_post_type( 'private_custom_book' );
Expand All @@ -92,16 +21,6 @@ public function tear_down() {
unregister_post_type( 'temp_custom_book' );
unregister_taxonomy( 'temp_book_type' );

// See comment in set_up for explanation.
if ( $this->pre_65_compat ) {
$this->handle_pre_65_post_type_variation_unregistration( 'custom_book' );
$this->handle_pre_65_post_type_variation_unregistration( 'private_custom_book' );
$this->handle_pre_65_post_type_variation_unregistration( 'temp_custom_book' );
$this->handle_pre_65_taxonomy_variation_unregistration( 'book_type' );
$this->handle_pre_65_taxonomy_variation_unregistration( 'private_book_type' );
$this->handle_pre_65_taxonomy_variation_unregistration( 'temp_book_type' );
}

parent::tear_down();
}

Expand All @@ -111,8 +30,7 @@ public function tear_down() {
public function test_navigation_link_variations_custom_post_type() {
$registry = WP_Block_Type_Registry::get_instance();
$nav_link_block = $registry->get_registered( 'core/navigation-link' );
// Use property and let __get handle it, so it works for core versions before adding get_variations as well
$variations = $nav_link_block->variations;
$variations = $nav_link_block->get_variations();
$this->assertNotEmpty( $variations, 'Block has no variations' );
$variation = $this->get_variation_by_name( 'custom_book', $variations );
$this->assertIsArray( $variation, 'Block variation does not exist' );
Expand All @@ -126,8 +44,7 @@ public function test_navigation_link_variations_custom_post_type() {
public function test_navigation_link_variations_private_custom_post_type() {
$registry = WP_Block_Type_Registry::get_instance();
$nav_link_block = $registry->get_registered( 'core/navigation-link' );
// Use property and let __get handle it, so it works for core versions before adding get_variations as well
$variations = $nav_link_block->variations;
$variations = $nav_link_block->get_variations();
$this->assertNotEmpty( $variations, 'Block has no variations' );
$variation = $this->get_variation_by_name( 'private_custom_book', $variations );
$this->assertEmpty( $variation, 'Block variation for private post type exists.' );
Expand All @@ -139,8 +56,7 @@ public function test_navigation_link_variations_private_custom_post_type() {
public function test_navigation_link_variations_custom_taxonomy() {
$registry = WP_Block_Type_Registry::get_instance();
$nav_link_block = $registry->get_registered( 'core/navigation-link' );
// Use property and let __get handle it, so it works for core versions before adding get_variations as well
$variations = $nav_link_block->variations;
$variations = $nav_link_block->get_variations();
$this->assertNotEmpty( $variations, 'Block has no variations' );
$variation = $this->get_variation_by_name( 'book_type', $variations );
$this->assertIsArray( $variation, 'Block variation does not exist' );
Expand All @@ -154,8 +70,7 @@ public function test_navigation_link_variations_custom_taxonomy() {
public function test_navigation_link_variations_private_custom_taxonomy() {
$registry = WP_Block_Type_Registry::get_instance();
$nav_link_block = $registry->get_registered( 'core/navigation-link' );
// Use property and let __get handle it, so it works for core versions before adding get_variations as well
$variations = $nav_link_block->variations;
$variations = $nav_link_block->get_variations();
$this->assertNotEmpty( $variations, 'Block has no variations' );
$variation = $this->get_variation_by_name( 'private_book_type', $variations );
$this->assertEmpty( $variation, 'Block variation for private taxonomy exists.' );
Expand All @@ -177,24 +92,15 @@ public function test_navigation_link_variations_unregister_post_type() {
)
);

if ( $this->pre_65_compat ) {
$this->handle_pre_65_post_type_variation_registration( $post_type );
}

$registry = WP_Block_Type_Registry::get_instance();
$nav_link_block = $registry->get_registered( 'core/navigation-link' );
// Use property and let __get handle it, so it works for core versions before adding get_variations as well
$variations = $nav_link_block->variations;
$variations = $nav_link_block->get_variations();
$this->assertNotEmpty( $variations, 'Block has no variations' );
$variation = $this->get_variation_by_name( 'temp_custom_book', $variations );
$this->assertIsArray( $variation, 'Block variation does not exist' );

unregister_post_type( $post_type->name );

if ( $this->pre_65_compat ) {
$this->handle_pre_65_post_type_variation_unregistration( $post_type->name );
}

// Update array, since it's an dynamic built array
$variations = $nav_link_block->variations;
$variation = $this->get_variation_by_name( 'temp_custom_book', $variations );
Expand All @@ -216,24 +122,15 @@ public function test_navigation_link_variations_unregister_taxonomy() {
)
);

if ( $this->pre_65_compat ) {
$this->handle_pre_65_taxonomy_variation_registration( $taxonomy );
}

$registry = WP_Block_Type_Registry::get_instance();
$nav_link_block = $registry->get_registered( 'core/navigation-link' );
// Use property and let __get handle it, so it works for core versions before adding get_variations as well
$variations = $nav_link_block->variations;
$variations = $nav_link_block->get_variations();
$this->assertNotEmpty( $variations, 'Block has no variations' );
$variation = $this->get_variation_by_name( 'temp_book_type', $variations );
$this->assertIsArray( $variation, 'Block variation does not exist' );

unregister_taxonomy( $taxonomy->name );

if ( $this->pre_65_compat ) {
$this->handle_pre_65_taxonomy_variation_unregistration( $taxonomy->name );
}

// Update array, since it's an dynamic built array
$variations = $nav_link_block->variations;
$variation = $this->get_variation_by_name( 'temp_book_type', $variations );
Expand All @@ -257,52 +154,4 @@ private function get_variation_by_name( $variation_name, $variations ) {

return $found_variation;
}

/**
* Registers a block variation for a post type with the deprecated methods for Core versions < 6.5.
* See comment in set_up for dexplanation.
*
* @param WP_Post_Type $post_type
*/
private function handle_pre_65_post_type_variation_registration( $post_type ) {
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_post_type_variation' );
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_variation' );
gutenberg_block_core_navigation_link_register_post_type_variation( $post_type->name, $post_type );
}

/**
* Unregisters a block variation for a post type with the deprecated methods for Core versions < 6.5.
* See comment in set_up for dexplanation.
*
* @param string $post_type
*/
private function handle_pre_65_post_type_variation_unregistration( $post_type ) {
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_post_type_variation' );
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_variation' );
gutenberg_block_core_navigation_link_unregister_post_type_variation( $post_type );
}

/**
* Registers a block variation for a taxonomy with the deprecated methods for Core versions < 6.5.
* See comment in set_up for dexplanation.
*
* @param WP_Taxonomy $post_type
*/
private function handle_pre_65_taxonomy_variation_registration( $taxonomy ) {
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_taxonomy_variation' );
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_variation' );
gutenberg_block_core_navigation_link_register_taxonomy_variation( $taxonomy->name, $taxonomy->object_type, (array) $taxonomy );
}

/**
* Unregisters a block variation for a taxonomy with the deprecated methods for Core versions < 6.5.
* See comment in set_up for dexplanation.
*
* @param string $post_type
*/
private function handle_pre_65_taxonomy_variation_unregistration( $taxonomy ) {
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_taxonomy_variation' );
$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_variation' );
gutenberg_block_core_navigation_link_unregister_taxonomy_variation( $taxonomy );
}
}
Loading