Fix PHPUnit tests in WordPress 5.6-beta1 (#5531)

Co-authored-by: Pierre Gordon <[email protected]>

Author: westonruter

tests/php/src/PluginRegistryTest.php

@@ -5,9 +5,11 @@
 use AmpProject\AmpWP\Infrastructure\Service;
 use AmpProject\AmpWP\PluginRegistry;
 use AmpProject\AmpWP\Tests\Helpers\MockPluginEnvironment;
+use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
 use PHPUnit\Framework\TestCase;
 
 final class PluginRegistryTest extends TestCase {
+	use PrivateAccess;
 
 	private function populate_plugins() {
 		wp_cache_set( 'plugins', [ '' => MockPluginEnvironment::PLUGINS_DATA ], 'plugins' );
@@ -21,6 +23,18 @@ public function test_it_can_be_initialized() {
 		$this->assertInstanceOf( Service::class, $plugin_registry );
 	}
 
+	/** @covers PluginRegistry::get_plugin_dir() */
+	public function test_get_plugin_dir() {
+		$plugin_registry = new PluginRegistry();
+
+		$plugin_directory = $plugin_registry->get_plugin_dir();
+		$this->assertEquals( WP_CONTENT_DIR . '/plugins', $plugin_directory );
+
+		$this->set_private_property( $plugin_registry, 'plugin_folder', 'amp/tests/php/data/plugins' );
+		$plugin_directory = $plugin_registry->get_plugin_dir();
+		$this->assertEquals( WP_CONTENT_DIR . '/plugins/amp/tests/php/data/plugins', $plugin_directory );
+	}
+
 	/** @covers PluginRegistry::get_plugin_slug_from_file() */
 	public function test_get_plugin_slug_from_file() {
 		$plugin_registry = new PluginRegistry();

tests/php/test-amp-facebook-embed-handler.php

@@ -95,15 +95,15 @@ public function get_scripts_data() {
 	 * @param array  $expected Expected scripts.
 	 */
 	public function test__get_scripts( $source, $expected ) {
+		if ( self::is_external_http_test_suite() ) {
+			$this->markTestSkipped( 'Endpoint is gone.' );
+		}
+
 		$embed = new AMP_Facebook_Embed_Handler();
 		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 
-		if ( self::is_external_http_test_suite() && "<p>$source</p>" === trim( $filtered_content ) ) {
-			$this->markTestSkipped( 'Endpoint is down.' );
-		}
-
 		$dom = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$embed->sanitize_raw_embeds( $dom );
 
@@ -280,15 +280,15 @@ public function get_raw_embed_dataset() {
 	 * @covers AMP_Facebook_Embed_Handler::sanitize_raw_embeds()
 	 */
 	public function test__raw_embed_sanitizer( $source, $expected ) {
+		if ( self::is_external_http_test_suite() ) {
+			$this->markTestSkipped( 'Endpoint is gone.' );
+		}
+
 		$embed = new AMP_Facebook_Embed_Handler();
 		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 
-		if ( self::is_external_http_test_suite() && "<p>$source</p>" === trim( $filtered_content ) ) {
-			$this->markTestSkipped( 'Endpoint is down.' );
-		}
-
 		$dom = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$embed->sanitize_raw_embeds( $dom );