Issue #864: Fix PHPUnit tests, accomodating is_amp_endpoint().

The widgets now exit from their methods is is_amp_endpoint(). So set this to true, with amp_theme_support( 'amp' ).
ampproject · Jan 23, 2018 · e0456e1 · e0456e1
1 parent 6053f9a
commit e0456e1
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 2 deletions.
diff --git a/includes/widgets/class-amp-widget-rss.php b/includes/widgets/class-amp-widget-rss.php
@@ -20,7 +20,7 @@ class AMP_Widget_RSS extends WP_Widget_RSS {
 	 * @return void.
 	 */
 	public function widget( $args, $instance ) {
-		if ( is_amp_endpoint() ) {
+		if ( ! is_amp_endpoint() ) {
 			parent::widget( $args, $instance );
 			return;
 		}

diff --git a/tests/test-class-amp-widget-archives.php b/tests/test-class-amp-widget-archives.php
@@ -19,6 +19,7 @@ class Test_AMP_Widget_Archives extends WP_UnitTestCase {
 	 */
 	public function setUp() {
 		parent::setUp();
+		add_theme_support( 'amp' );
 		wp_maybe_load_widgets();
 		AMP_Theme_Support::init();
 	}

diff --git a/tests/test-class-amp-widget-categories.php b/tests/test-class-amp-widget-categories.php
@@ -19,6 +19,7 @@ class Test_AMP_Widget_Categories extends WP_UnitTestCase {
 	 */
 	public function setUp() {
 		parent::setUp();
+		add_theme_support( 'amp ' );
 		wp_maybe_load_widgets();
 		AMP_Theme_Support::init();
 	}

diff --git a/tests/test-class-amp-widget-media-audio.php b/tests/test-class-amp-widget-media-audio.php
@@ -23,6 +23,7 @@ public function setUp() {
 			$this->markTestSkipped( sprintf( 'The widget %s is not present, so neither is its child class.', $wp_widget ) );
 		}
 		parent::setUp();
+		add_theme_support( 'amp' );
 		wp_maybe_load_widgets();
 		AMP_Theme_Support::init();
 	}

diff --git a/tests/test-class-amp-widget-media-gallery.php b/tests/test-class-amp-widget-media-gallery.php
@@ -23,6 +23,7 @@ public function setUp() {
 			$this->markTestSkipped( sprintf( 'The widget %s is not present, so neither is its child class.', $wp_widget ) );
 		}
 		parent::setUp();
+		add_theme_support( 'amp' );
 		wp_maybe_load_widgets();
 		AMP_Theme_Support::init();
 	}

diff --git a/tests/test-class-amp-widget-media-image.php b/tests/test-class-amp-widget-media-image.php
@@ -23,6 +23,7 @@ public function setUp() {
 			$this->markTestSkipped( sprintf( 'The widget %s is not present, so neither is its child class.', $wp_widget ) );
 		}
 		parent::setUp();
+		add_theme_support( 'amp' );
 		AMP_Theme_Support::init();
 	}
 

diff --git a/tests/test-class-amp-widget-media-video.php b/tests/test-class-amp-widget-media-video.php
@@ -23,6 +23,7 @@ public function setUp() {
 			$this->markTestSkipped( sprintf( 'The widget %s is not present, so neither is its child class.', $wp_widget ) );
 		}
 		parent::setUp();
+		add_theme_support( 'amp' );
 		AMP_Theme_Support::init();
 	}
 

diff --git a/tests/test-class-amp-widget-recent-comments.php b/tests/test-class-amp-widget-recent-comments.php
@@ -12,6 +12,16 @@
  */
 class Test_AMP_Widget_Recent_Comments extends WP_UnitTestCase {
 
+	/**
+	 * Setup.
+	 *
+	 * @inheritdoc
+	 */
+	public function setUp() {
+		parent::setUp();
+		add_theme_support( 'amp' );
+	}
+
 	/**
 	 * Test construct().
 	 *

diff --git a/tests/test-class-amp-widget-rss.php b/tests/test-class-amp-widget-rss.php
@@ -12,6 +12,18 @@
  */
 class Test_AMP_Widget_RSS extends WP_UnitTestCase {
 
+	/**
+	 * Setup.
+	 *
+	 * @inheritdoc
+	 */
+	public function setUp() {
+		parent::setUp();
+		add_theme_support( 'amp' );
+		wp_maybe_load_widgets();
+		AMP_Theme_Support::init();
+	}
+
 	/**
 	 * Test construct().
 	 *
@@ -54,7 +66,7 @@ public function test_widget() {
 		$widget->widget( $args, $instance );
 		$output = ob_get_clean();
 
-		$this->assertFalse( strpos( $output, '<img' ) );
+		$this->assertNotContains( '<img', $output );
 		$this->assertContains( '<amp-img', $output );
 	}