Merge pull request #223 from Yoast/DUPP-56-enqueue-styles-in-classic-editor

Author: maartenleenders

src/ui/classic-editor.php

@@ -68,7 +68,12 @@ public function register_hooks() {
 		\add_filter( 'post_updated_messages', [ $this, 'change_scheduled_notice_classic_editor' ], 10, 1 );
 
 		\add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_classic_editor_scripts' ] );
-		\add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_classic_editor_styles' ] );
+		if ( \intval( Utils::get_option( 'duplicate_post_show_link_in', 'submitbox' ) ) === 1 ) {
+			if ( \intval( Utils::get_option( 'duplicate_post_show_link', 'new_draft' ) ) === 1
+				|| \intval( Utils::get_option( 'duplicate_post_show_link', 'rewrite_republish' ) ) === 1 ) {
+				\add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_classic_editor_styles' ] );
+			}
+		}
 
 		// Remove slug editing from Classic Editor.
 		\add_action( 'add_meta_boxes', [ $this, 'remove_slug_meta_box' ], 10, 2 );
@@ -102,7 +107,7 @@ public function enqueue_classic_editor_styles() {
 			$id   = \intval( \wp_unslash( $_GET['post'] ) );
 			$post = \get_post( $id );
 
-			if ( ! \is_null( $post ) && $this->permissions_helper->is_rewrite_and_republish_copy( $post ) ) {
+			if ( ! \is_null( $post ) && $this->permissions_helper->should_links_be_displayed( $post ) ) {
 				$this->asset_manager->enqueue_styles();
 			}
 		}

tests/ui/classic-editor-test.php

@@ -19,28 +19,28 @@ class Classic_Editor_Test extends TestCase {
 	/**
 	 * Holds the object to create the action link to duplicate.
 	 *
-	 * @var Link_Builder
+	 * @var Link_Builder|\Mockery\MockInterface
 	 */
 	protected $link_builder;
 
 	/**
 	 * Holds the permissions helper.
 	 *
-	 * @var Permissions_Helper
+	 * @var Permissions_Helper|\Mockery\MockInterface
 	 */
 	protected $permissions_helper;
 
 	/**
 	 * Holds the asset manager.
 	 *
-	 * @var Asset_Manager
+	 * @var Asset_Manager|\Mockery\MockInterface
 	 */
 	protected $asset_manager;
 
 	/**
 	 * The instance.
 	 *
-	 * @var Classic_Editor
+	 * @var Classic_Editor&\Mockery\MockInterface
 	 */
 	protected $instance;
 
@@ -93,12 +93,12 @@ public function test_register_hooks() {
 
 		$utils->expects( 'get_option' )
 			->with( 'duplicate_post_show_link_in', 'submitbox' )
-			->once()
+			->twice()
 			->andReturn( '1' );
 
 		$utils->expects( 'get_option' )
 			->with( 'duplicate_post_show_link', 'new_draft' )
-			->once()
+			->twice()
 			->andReturn( '1' );
 
 		$utils->expects( 'get_option' )
@@ -154,7 +154,7 @@ public function test_enqueue_classic_editor_scripts() {
 	}
 
 	/**
-	 * Tests the successful enqueue_classic_editor_scripts function.
+	 * Tests the successful enqueue_classic_editor_styles function.
 	 *
 	 * @covers \Yoast\WP\Duplicate_Post\UI\Classic_Editor::enqueue_classic_editor_styles
 	 */
@@ -169,7 +169,7 @@ public function test_enqueue_classic_editor_styles() {
 			->with( 123 )
 			->andReturn( $post );
 
-		$this->permissions_helper->expects( 'is_rewrite_and_republish_copy' )
+		$this->permissions_helper->expects( 'should_links_be_displayed' )
 			->with( $post )
 			->andReturnTrue();