Fix Test_AMP_Validation_Manager::test_enqueue_block_validation() test

Author: pierlon

tests/php/src/Editor/EditorSupportTest.php

@@ -2,17 +2,18 @@
 
 namespace AmpProject\AmpWP\Tests\Editor;
 
-use AMP_Options_Manager;
 use AmpProject\AmpWP\DependencySupport;
 use AmpProject\AmpWP\Editor\EditorSupport;
 use AmpProject\AmpWP\Infrastructure\Registerable;
 use AmpProject\AmpWP\Infrastructure\Service;
-use AmpProject\AmpWP\Option;
+use AmpProject\AmpWP\Tests\Helpers\WithBlockEditorSupport;
 use AmpProject\AmpWP\Tests\TestCase;
 
 /** @coversDefaultClass \AmpProject\AmpWP\Editor\EditorSupport */
 final class EditorSupportTest extends TestCase {
 
+	use WithBlockEditorSupport;
+
 	/** @var EditorSupport */
 	private $instance;
 
@@ -135,30 +136,4 @@ public function test_maybe_show_notice_for_gutenberg_4_9() {
 		$inline_script = wp_scripts()->print_inline_script( 'wp-edit-post', 'after', false );
 		$this->assertStringContainsString( 'AMP functionality is not available', $inline_script );
 	}
-
-	/**
-	 * Setup test environment to ensure the correct result for ::supports_current_screen().
-	 *
-	 * @param bool   $post_type_uses_block_editor Whether the post type uses the block editor.
-	 * @param bool   $post_type_supports_amp      Whether the post type supports AMP.
-	 * @param string $post_type                   Post type ID.
-	 */
-	private function setup_environment( $post_type_uses_block_editor, $post_type_supports_amp, $post_type = 'foo' ) {
-		if ( $post_type_uses_block_editor ) {
-			set_current_screen( 'post.php' );
-			get_current_screen()->is_block_editor = $post_type_uses_block_editor;
-		}
-
-		if ( $post_type_supports_amp ) {
-			register_post_type( $post_type, [ 'public' => true ] );
-			$GLOBALS['post'] = self::factory()->post->create( [ 'post_type' => $post_type ] );
-			wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
-
-			$supported_post_types = array_merge(
-				AMP_Options_Manager::get_option( Option::SUPPORTED_POST_TYPES ),
-				[ $post_type ]
-			);
-			AMP_Options_Manager::update_option( Option::SUPPORTED_POST_TYPES, $supported_post_types );
-		}
-	}
 }

tests/php/src/Helpers/WithBlockEditorSupport.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Trait WithoutBlockPreRendering.
+ *
+ * @package AmpProject\AmpWP
+ */
+
+namespace AmpProject\AmpWP\Tests\Helpers;
+
+use AMP_Options_Manager;
+use AmpProject\AmpWP\Option;
+
+/**
+ * Helper trait to help with setting up the test environment for block editor support.
+ */
+trait WithBlockEditorSupport {
+
+	/**
+	 * Setup test environment to ensure the correct result for ::supports_current_screen().
+	 *
+	 * @param bool   $post_type_uses_block_editor Whether the post type uses the block editor.
+	 * @param bool   $post_type_supports_amp      Whether the post type supports AMP.
+	 * @param string $post_type                   Post type ID.
+	 */
+	public function setup_environment( $post_type_uses_block_editor, $post_type_supports_amp, $post_type = 'foo' ) {
+		if ( $post_type_uses_block_editor ) {
+			set_current_screen( 'post.php' );
+			get_current_screen()->is_block_editor = $post_type_uses_block_editor;
+		}
+
+		if ( $post_type_supports_amp ) {
+			register_post_type( $post_type, [ 'public' => true ] );
+			$GLOBALS['post'] = self::factory()->post->create( [ 'post_type' => $post_type ] );
+			wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
+
+			$supported_post_types = array_merge(
+				AMP_Options_Manager::get_option( Option::SUPPORTED_POST_TYPES ),
+				[ $post_type ]
+			);
+			AMP_Options_Manager::update_option( Option::SUPPORTED_POST_TYPES, $supported_post_types );
+		}
+	}
+}

tests/php/validation/test-class-amp-validation-manager.php

@@ -14,6 +14,7 @@
 use AmpProject\AmpWP\Tests\DependencyInjectedTestCase;
 use AmpProject\AmpWP\Tests\Helpers\HandleValidation;
 use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
+use AmpProject\AmpWP\Tests\Helpers\WithBlockEditorSupport;
 use AmpProject\AmpWP\Tests\Helpers\WithoutBlockPreRendering;
 use AmpProject\Dom\Document;
 
@@ -27,6 +28,7 @@ class Test_AMP_Validation_Manager extends DependencyInjectedTestCase {
 
 	use HandleValidation;
 	use PrivateAccess;
+	use WithBlockEditorSupport;
 	use WithoutBlockPreRendering {
 		setUp as public prevent_block_pre_render;
 	}
@@ -2401,10 +2403,10 @@ public function test_enqueue_block_validation() {
 			$this->markTestSkipped( 'Block editor is too old.' );
 		}
 
-		global $post;
-		$post = self::factory()->post->create_and_get();
-		$slug = 'amp-block-validation';
+		$this->setup_environment( true, true );
 		AMP_Validation_Manager::enqueue_block_validation();
+
+		$slug = 'amp-block-validation';
 		$this->assertFalse( wp_script_is( $slug, 'enqueued' ) );
 
 		// Ensure not displayed when dev tools is disabled.