-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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
Fix Navigation Links when post type is not Page or Post #28892
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| <?php | ||
| /** | ||
| * Tests server side rendering of core/navigation-link | ||
| * | ||
| * @package Gutenberg | ||
| * @subpackage block-library | ||
| */ | ||
|
|
||
| /** | ||
| * Tests for various cases in Navigation Link rendering | ||
| */ | ||
| class Block_Library_Navigation_Link_Test extends WP_UnitTestCase { | ||
| private static $category; | ||
| private static $page; | ||
| private static $draft; | ||
|
|
||
| private static $pages; | ||
| private static $terms; | ||
|
|
||
| public static function wpSetUpBeforeClass() { | ||
|
|
||
| self::$draft = self::factory()->post->create_and_get( | ||
| array( | ||
| 'post_type' => 'page', | ||
| 'post_status' => 'draft', | ||
| 'post_name' => 'ceilingcat', | ||
| 'post_title' => 'Ceiling Cat', | ||
| 'post_content' => 'Ceiling Cat content', | ||
| 'post_excerpt' => 'Ceiling Cat', | ||
| ) | ||
| ); | ||
| self::$pages[] = self::$draft; | ||
|
|
||
| self::$page = self::factory()->post->create_and_get( | ||
| array( | ||
| 'post_type' => 'page', | ||
| 'post_status' => 'publish', | ||
| 'post_name' => 'tabby', | ||
| 'post_title' => 'Tabby cats', | ||
| 'post_content' => 'Tabby cat content', | ||
| 'post_excerpt' => 'Tabby cat', | ||
| ) | ||
| ); | ||
| self::$pages[] = self::$page; | ||
|
|
||
| self::$category = self::factory()->category->create_and_get( | ||
| array( | ||
| 'taxonomy' => 'category', | ||
| 'name' => 'cats', | ||
| 'slug' => 'cats', | ||
| 'description' => 'Cats Category', | ||
| ) | ||
| ); | ||
|
|
||
| self::$terms[] = self::$category; | ||
| } | ||
|
|
||
| public static function wpTearDownAfterClass() { | ||
| foreach ( self::$pages as $page_to_delete ) { | ||
| wp_delete_post( $page_to_delete ); | ||
| } | ||
| foreach ( self::$terms as $term_to_delete ) { | ||
| wp_delete_term( $term_to_delete->term_id, $term_to_delete->taxonomy ); | ||
| } | ||
| } | ||
|
|
||
| function test_returns_link_when_post_is_published() { | ||
| $page_id = self::$page->ID; | ||
|
|
||
| $parsed_blocks = parse_blocks( | ||
| "<!-- wp:navigation-link {\"label\":\"Sample Page\",\"type\":\"page\",\"id\":{$page_id},\"url\":\"http://localhost:8888/?page_id={$page_id}\"} /-->" | ||
| ); | ||
| $this->assertEquals( 1, count( $parsed_blocks ) ); | ||
|
|
||
| $navigation_link_block = new WP_Block( $parsed_blocks[0], array() ); | ||
| $this->assertEquals( | ||
| true, | ||
| strpos( | ||
| gutenberg_render_block_core_navigation_link( | ||
| $navigation_link_block->attributes, | ||
| array(), | ||
| $navigation_link_block | ||
| ), | ||
| 'Sample Page' | ||
| ) !== false | ||
| ); | ||
| } | ||
|
|
||
| function test_returns_empty_when_label_is_missing() { | ||
| $page_id = self::$page->ID; | ||
|
|
||
| $parsed_blocks = parse_blocks( | ||
| "<!-- wp:navigation-link {\"type\":\"page\",\"id\":{$page_id},\"url\":\"http://localhost:8888/?page_id={$page_id}\"} /-->" | ||
| ); | ||
| $this->assertEquals( 1, count( $parsed_blocks ) ); | ||
|
|
||
| $navigation_link_block = new WP_Block( $parsed_blocks[0], array() ); | ||
| $this->assertEquals( | ||
| '', | ||
| gutenberg_render_block_core_navigation_link( | ||
| $navigation_link_block->attributes, | ||
| array(), | ||
| $navigation_link_block | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| function test_returns_empty_when_draft() { | ||
| $page_id = self::$draft->ID; | ||
|
|
||
| $parsed_blocks = parse_blocks( | ||
| "<!-- wp:navigation-link {\"label\":\"Draft Page\",\"type\":\"page\",\"id\":{$page_id},\"url\":\"http://localhost:8888/?page_id={$page_id}\"} /-->" | ||
| ); | ||
| $this->assertEquals( 1, count( $parsed_blocks ) ); | ||
|
|
||
| $navigation_link_block = new WP_Block( $parsed_blocks[0], array() ); | ||
|
|
||
| $this->assertEquals( | ||
| '', | ||
| gutenberg_render_block_core_navigation_link( | ||
| $navigation_link_block->attributes, | ||
| array(), | ||
| $navigation_link_block | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| function test_returns_link_for_category() { | ||
| $category_id = self::$category->term_id; | ||
|
|
||
| $parsed_blocks = parse_blocks( | ||
| "<!-- wp:navigation-link {\"label\":\"Cats\",\"type\":\"category\",\"id\":{$category_id},\"url\":\"http://localhost:8888/?cat={$category_id}\"} /-->" | ||
| ); | ||
| $this->assertEquals( 1, count( $parsed_blocks ) ); | ||
|
|
||
| $navigation_link_block = new WP_Block( $parsed_blocks[0], array() ); | ||
| $this->assertEquals( | ||
| true, | ||
| strpos( | ||
| gutenberg_render_block_core_navigation_link( | ||
| $navigation_link_block->attributes, | ||
| array(), | ||
| $navigation_link_block | ||
| ), | ||
| 'Cats' | ||
| ) !== false | ||
| ); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder here if we should exclude what
get_postdoes not support (tags, categories) because CPT's (e.g. abook) should also follow this draft logic but we can't add them all to this condition.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is a good point @draganescu. Thanks for taking a look! How about we follow up on it in the next PR, since I'm working on #24814 which adds variations for CPTs and taxonomies?
At the moment I'm not sure
typeis enough to encapsulate what something is. It looks like we're using the post-type and taxonomy slug as a type value, and I'm not sure we enforce uniqueness across the two strings. For example can someone create a poorly named custom taxonomy that collides with a custom post type? I'll need to experiment. We'll also need to respectshow_in_nav_menuson both entities.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As long as this remains on the radar, I am merging this 🚀