From ce66658e715e6a0be434deb2c9fe0e7dbab75c6e Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 21 Mar 2018 17:46:28 -0700
Subject: [PATCH 01/22] Fix phpunit warnings regarding use of @cover
 fornon-existing class or interface

---
 tests/test-amp-analytics-options.php |  4 ++--
 tests/test-amp-helper-functions.php  | 14 +++++++-------
 tests/test-amp.php                   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/test-amp-analytics-options.php b/tests/test-amp-analytics-options.php
index eb91137771f..5472864cedf 100644
--- a/tests/test-amp-analytics-options.php
+++ b/tests/test-amp-analytics-options.php
@@ -216,7 +216,7 @@ function test_two_analytics_components_added() {
 	/**
 	 * Test amp_get_analytics()
 	 *
-	 * @covers amp_get_analytics()
+	 * @covers \amp_get_analytics()
 	 */
 	public function test_amp_get_analytics() {
 		$this->insert_one_option(
@@ -243,7 +243,7 @@ public function test_amp_get_analytics() {
 	/**
 	 * Test amp_print_analytics()
 	 *
-	 * @covers amp_print_analytics()
+	 * @covers \amp_print_analytics()
 	 */
 	public function test_amp_print_analytics() {
 		$this->insert_one_option(
diff --git a/tests/test-amp-helper-functions.php b/tests/test-amp-helper-functions.php
index 3dd206da7aa..b29f3eefaa7 100644
--- a/tests/test-amp-helper-functions.php
+++ b/tests/test-amp-helper-functions.php
@@ -35,7 +35,7 @@ public function return_example_url( $url, $post_id ) {
 	/**
 	 * Test amp_get_slug().
 	 *
-	 * @covers amp_get_slug()
+	 * @covers \amp_get_slug()
 	 */
 	public function test_amp_get_slug() {
 		$this->assertSame( 'amp', amp_get_slug() );
@@ -181,8 +181,8 @@ public function capture_filter_call( $value ) {
 	/**
 	 * Test script registering.
 	 *
-	 * @covers amp_register_default_scripts()
-	 * @covers amp_filter_script_loader_tag()
+	 * @covers \amp_register_default_scripts()
+	 * @covers \amp_filter_script_loader_tag()
 	 * @global WP_Scripts $wp_scripts
 	 */
 	public function test_script_registering() {
@@ -223,7 +223,7 @@ public function test_script_registering() {
 	/**
 	 * Test amp_get_content_embed_handlers().
 	 *
-	 * @covers amp_get_content_embed_handlers()
+	 * @covers \amp_get_content_embed_handlers()
 	 */
 	public function test_amp_get_content_embed_handlers() {
 		$post = $this->factory()->post->create_and_get();
@@ -249,7 +249,7 @@ public function test_amp_get_content_embed_handlers() {
 	/**
 	 * Test deprecated $post param for amp_get_content_embed_handlers().
 	 *
-	 * @covers amp_get_content_embed_handlers()
+	 * @covers \amp_get_content_embed_handlers()
 	 */
 	public function test_amp_get_content_embed_handlers_deprecated_param() {
 		$post = $this->factory()->post->create_and_get();
@@ -261,7 +261,7 @@ public function test_amp_get_content_embed_handlers_deprecated_param() {
 	/**
 	 * Test amp_get_content_sanitizers().
 	 *
-	 * @covers amp_get_content_sanitizers()
+	 * @covers \amp_get_content_sanitizers()
 	 */
 	public function test_amp_get_content_sanitizers() {
 		$post = $this->factory()->post->create_and_get();
@@ -299,7 +299,7 @@ public function test_amp_get_content_sanitizers() {
 	/**
 	 * Test deprecated $post param for amp_get_content_sanitizers().
 	 *
-	 * @covers amp_get_content_sanitizers()
+	 * @covers \amp_get_content_sanitizers()
 	 */
 	public function test_amp_get_content_sanitizers_deprecated_param() {
 		$post = $this->factory()->post->create_and_get();
diff --git a/tests/test-amp.php b/tests/test-amp.php
index 19b68d9ad26..d78bc2edaab 100644
--- a/tests/test-amp.php
+++ b/tests/test-amp.php
@@ -21,7 +21,7 @@ public function tearDown() {
 	/**
 	 * Test amp_is_canonical().
 	 *
-	 * @covers amp_is_canonical()
+	 * @covers \amp_is_canonical()
 	 */
 	public function test_amp_is_canonical() {
 		remove_theme_support( 'amp' );

From 1fe55278955fbd99f66ad13fd16af4c3f571fa2d Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 21 Mar 2018 18:16:46 -0700
Subject: [PATCH 02/22] Add stubs for missing tests; re-order tests to mirror
 order in theme support class

---
 phpunit.xml                            |   1 +
 tests/test-class-amp-theme-support.php | 516 +++++++++++++++++--------
 2 files changed, 354 insertions(+), 163 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index a2b80c5bb36..4d7d8f842a4 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -22,6 +22,7 @@
 			<directory suffix=".php">./</directory>
 			<exclude>
 				<directory suffix=".php">dev-lib</directory>
+				<directory suffix=".php">svn</directory>
 				<directory suffix=".php">node_modules</directory>
 				<directory suffix=".php">tests</directory>
 				<directory suffix=".php">vendor</directory>
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 0e1bd39df8e..a7a42dc17a5 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -30,6 +30,25 @@ public function tearDown() {
 		AMP_Theme_Support::$headers_sent = array();
 	}
 
+	/**
+	 * Test init.
+	 *
+	 * @covers AMP_Theme_Support::init()
+	 * @covers AMP_Theme_Support::finish_init()
+	 */
+	public function test_init() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test redirect_canonical_amp.
+	 *
+	 * @covers AMP_Theme_Support::redirect_canonical_amp()
+	 */
+	public function test_redirect_canonical_amp() {
+		$this->markTestIncomplete();
+	}
+
 	/**
 	 * Test is_paired_available.
 	 *
@@ -78,181 +97,30 @@ public function test_is_paired_available() {
 	}
 
 	/**
-	 * Test register_widgets().
-	 *
-	 * @covers AMP_Theme_Support::register_widgets()
-	 * @global WP_Widget_Factory $wp_widget_factory
-	 */
-	public function test_register_widgets() {
-		global $wp_widget_factory;
-		remove_all_actions( 'widgets_init' );
-		$wp_widget_factory->widgets = array();
-		wp_widgets_init();
-		AMP_Theme_Support::register_widgets();
-
-		$this->assertArrayNotHasKey( 'WP_Widget_Categories', $wp_widget_factory->widgets );
-		$this->assertArrayHasKey( 'AMP_Widget_Categories', $wp_widget_factory->widgets );
-	}
-
-	/**
-	 * Test amend_comment_form().
-	 *
-	 * @covers AMP_Theme_Support::amend_comment_form()
-	 */
-	public function test_amend_comment_form() {
-		$post_id = $this->factory()->post->create();
-		$this->go_to( get_permalink( $post_id ) );
-		$this->assertTrue( is_singular() );
-
-		// Test native AMP.
-		add_theme_support( 'amp' );
-		$this->assertTrue( amp_is_canonical() );
-		ob_start();
-		AMP_Theme_Support::amend_comment_form();
-		$output = ob_get_clean();
-		$this->assertNotContains( '<input type="hidden" name="redirect_to"', $output );
-		$this->assertContains( '<div submit-success>', $output );
-		$this->assertContains( '<div submit-error>', $output );
-
-		// Test paired AMP.
-		add_theme_support( 'amp', array(
-			'template_dir' => 'amp-templates',
-		) );
-		$this->assertFalse( amp_is_canonical() );
-		ob_start();
-		AMP_Theme_Support::amend_comment_form();
-		$output = ob_get_clean();
-		$this->assertContains( '<input type="hidden" name="redirect_to"', $output );
-		$this->assertContains( '<div submit-success>', $output );
-		$this->assertContains( '<div submit-error>', $output );
-	}
-
-	/**
-	 * Test prepare_response.
+	 * Test is_customize_preview_iframe.
 	 *
-	 * @global WP_Widget_Factory $wp_widget_factory
-	 * @global WP_Scripts $wp_scripts
-	 * @covers AMP_Theme_Support::prepare_response()
+	 * @covers AMP_Theme_Support::is_customize_preview_iframe()
 	 */
-	public function test_prepare_response() {
-		global $wp_widget_factory, $wp_scripts;
-		$wp_scripts = null;
-
-		add_theme_support( 'amp' );
-		AMP_Theme_Support::init();
-		AMP_Theme_Support::finish_init();
-		$wp_widget_factory = new WP_Widget_Factory();
-		wp_widgets_init();
-
-		add_action( 'wp_enqueue_scripts', function() {
-			wp_enqueue_script( 'amp-list' );
-		} );
-		add_action( 'wp_footer', function() {
-			wp_print_scripts( 'amp-mathml' );
-			?>
-			<amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml>
-			<?php
-		}, 1 );
-
-		ob_start();
-		?>
-		<!DOCTYPE html>
-		<html amp <?php language_attributes(); ?>>
-			<head>
-				<?php wp_head(); ?>
-				<script data-head>document.write('Illegal');</script>
-			</head>
-			<body>
-				<img width="100" height="100" src="https://example.com/test.png">
-				<audio width="400" height="300" src="https://example.com/audios/myaudio.mp3"></audio>
-				<amp-ad type="a9"
-					width="300"
-					height="250"
-					data-aax_size="300x250"
-					data-aax_pubname="test123"
-					data-aax_src="302"></amp-ad>
-				<?php wp_footer(); ?>
-
-				<button onclick="alert('Illegal');">no-onclick</button>
-
-				<style>body { background: black; }</style>
-			</body>
-		</html>
-		<?php
-		$original_html  = trim( ob_get_clean() );
-		$removed_nodes  = array();
-		$sanitized_html = AMP_Theme_Support::prepare_response( $original_html, array(
-			'validation_error_callback' => function( $removed ) use ( &$removed_nodes ) {
-				$removed_nodes[ $removed['node']->nodeName ] = $removed['node'];
-			},
-		) );
-
-		$this->assertContains( '<meta charset="' . get_bloginfo( 'charset' ) . '">', $sanitized_html );
-		$this->assertContains( '<meta name="viewport" content="width=device-width,minimum-scale=1">', $sanitized_html );
-		$this->assertContains( '<style amp-boilerplate>', $sanitized_html );
-		$this->assertContains( '<style amp-custom>body { background: black; }', $sanitized_html );
-		$this->assertContains( '<script type="text/javascript" src="https://cdn.ampproject.org/v0.js" async></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
-		$this->assertContains( '<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-list-latest.js" async custom-element="amp-list"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
-		$this->assertContains( '<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-mathml-latest.js" async custom-element="amp-mathml"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
-		$this->assertContains( '<meta name="generator" content="AMP Plugin', $sanitized_html );
-
-		$this->assertNotContains( '<img', $sanitized_html );
-		$this->assertContains( '<amp-img', $sanitized_html );
-
-		$this->assertNotContains( '<audio', $sanitized_html );
-		$this->assertContains( '<amp-audio', $sanitized_html );
-
-		// Note these are single-quoted because they are injected after the DOM has been re-serialized, so the type and src attributes come from WP_Scripts::do_item().
-		$this->assertContains( '<script type=\'text/javascript\' src=\'https://cdn.ampproject.org/v0/amp-audio-latest.js\' async custom-element="amp-audio"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
-		$this->assertContains( '<script type=\'text/javascript\' src=\'https://cdn.ampproject.org/v0/amp-ad-latest.js\' async custom-element="amp-ad"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
-
-		$this->assertContains( '<button>no-onclick</button>', $sanitized_html );
-		$this->assertCount( 3, $removed_nodes );
-		$this->assertInstanceOf( 'DOMElement', $removed_nodes['script'] );
-		$this->assertInstanceOf( 'DOMAttr', $removed_nodes['onclick'] );
+	public function test_is_customize_preview_iframe() {
+		$this->markTestIncomplete();
 	}
 
 	/**
-	 * Test prepare_response for bad/non-HTML.
+	 * Test register_paired_hooks.
 	 *
-	 * @covers AMP_Theme_Support::prepare_response()
+	 * @covers AMP_Theme_Support::register_paired_hooks()
 	 */
-	public function test_prepare_response_bad_html() {
-		add_theme_support( 'amp' );
-		AMP_Theme_Support::init();
-
-		// JSON.
-		$input = '{"success":true}';
-		$this->assertEquals( $input, AMP_Theme_Support::prepare_response( $input ) );
-
-		// Nothing, for redirect.
-		$input = '';
-		$this->assertEquals( $input, AMP_Theme_Support::prepare_response( $input ) );
-
-		// HTML, but very stripped down.
-		$input  = '<html>Hello</html>';
-		$output = AMP_Theme_Support::prepare_response( $input );
-		$this->assertContains( '<html amp', $output );
+	public function test_register_paired_hooks() {
+		$this->markTestIncomplete();
 	}
 
 	/**
-	 * Test prepare_response to inject html[amp] attribute and ensure HTML5 doctype.
+	 * Test add_hooks.
 	 *
-	 * @covers AMP_Theme_Support::prepare_response()
+	 * @covers AMP_Theme_Support::add_hooks()
 	 */
-	public function test_prepare_response_to_add_html5_doctype_and_amp_attribute() {
-		add_theme_support( 'amp' );
-		AMP_Theme_Support::init();
-		ob_start();
-		?>
-		<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-		<html><head><?php wp_head(); ?></head><body><?php wp_footer(); ?></body></html>
-		<?php
-		$original_html  = trim( ob_get_clean() );
-		$sanitized_html = AMP_Theme_Support::prepare_response( $original_html );
-
-		$this->assertStringStartsWith( '<!DOCTYPE html>', $sanitized_html );
-		$this->assertContains( '<html amp', $sanitized_html );
+	public function test_add_hooks() {
+		$this->markTestIncomplete();
 	}
 
 	/**
@@ -302,6 +170,15 @@ public function test_purge_amp_query_vars() {
 		// phpcs:enable WordPress.Security.NonceVerification.NoNonceVerification
 	}
 
+	/**
+	 * Test send_header.
+	 *
+	 * @covers AMP_Theme_Support::send_header()
+	 */
+	public function test_send_header() {
+		$this->markTestIncomplete();
+	}
+
 	/**
 	 * Test handle_xhr_request().
 	 *
@@ -532,6 +409,155 @@ public function test_intercept_post_request_redirect() {
 		);
 	}
 
+	/**
+	 * Test register_widgets().
+	 *
+	 * @covers AMP_Theme_Support::register_widgets()
+	 * @global WP_Widget_Factory $wp_widget_factory
+	 */
+	public function test_register_widgets() {
+		global $wp_widget_factory;
+		remove_all_actions( 'widgets_init' );
+		$wp_widget_factory->widgets = array();
+		wp_widgets_init();
+		AMP_Theme_Support::register_widgets();
+
+		$this->assertArrayNotHasKey( 'WP_Widget_Categories', $wp_widget_factory->widgets );
+		$this->assertArrayHasKey( 'AMP_Widget_Categories', $wp_widget_factory->widgets );
+	}
+
+	/**
+	 * Test register_content_embed_handlers.
+	 *
+	 * @covers AMP_Theme_Support::register_content_embed_handlers()
+	 */
+	public function test_register_content_embed_handlers() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test amp_set_comments_walker.
+	 *
+	 * @covers AMP_Theme_Support::amp_set_comments_walker()
+	 */
+	public function test_amp_set_comments_walker() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test amend_comment_form().
+	 *
+	 * @covers AMP_Theme_Support::amend_comment_form()
+	 */
+	public function test_amend_comment_form() {
+		$post_id = $this->factory()->post->create();
+		$this->go_to( get_permalink( $post_id ) );
+		$this->assertTrue( is_singular() );
+
+		// Test native AMP.
+		add_theme_support( 'amp' );
+		$this->assertTrue( amp_is_canonical() );
+		ob_start();
+		AMP_Theme_Support::amend_comment_form();
+		$output = ob_get_clean();
+		$this->assertNotContains( '<input type="hidden" name="redirect_to"', $output );
+		$this->assertContains( '<div submit-success>', $output );
+		$this->assertContains( '<div submit-error>', $output );
+
+		// Test paired AMP.
+		add_theme_support( 'amp', array(
+			'template_dir' => 'amp-templates',
+		) );
+		$this->assertFalse( amp_is_canonical() );
+		ob_start();
+		AMP_Theme_Support::amend_comment_form();
+		$output = ob_get_clean();
+		$this->assertContains( '<input type="hidden" name="redirect_to"', $output );
+		$this->assertContains( '<div submit-success>', $output );
+		$this->assertContains( '<div submit-error>', $output );
+	}
+
+	/**
+	 * Test add_amp_comment_form_templates.
+	 *
+	 * @covers AMP_Theme_Support::add_amp_comment_form_templates()
+	 */
+	public function test_add_amp_comment_form_templates() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test filter_paired_template_hierarchy.
+	 *
+	 * @covers AMP_Theme_Support::filter_paired_template_hierarchy()
+	 */
+	public function test_filter_paired_template_hierarchy() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test filter_paired_template_include.
+	 *
+	 * @covers AMP_Theme_Support::filter_paired_template_include()
+	 */
+	public function test_filter_paired_template_include() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test get_current_canonical_url.
+	 *
+	 * @covers AMP_Theme_Support::get_current_canonical_url()
+	 */
+	public function test_get_current_canonical_url() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test get_comment_form_state_id.
+	 *
+	 * @covers AMP_Theme_Support::get_comment_form_state_id()
+	 */
+	public function test_get_comment_form_state_id() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test filter_comment_form_defaults.
+	 *
+	 * @covers AMP_Theme_Support::filter_comment_form_defaults()
+	 */
+	public function test_filter_comment_form_defaults() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test filter_comment_reply_link.
+	 *
+	 * @covers AMP_Theme_Support::filter_comment_reply_link()
+	 */
+	public function test_filter_comment_reply_link() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test filter_cancel_comment_reply_link.
+	 *
+	 * @covers AMP_Theme_Support::filter_cancel_comment_reply_link()
+	 */
+	public function test_filter_cancel_comment_reply_link() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test print_amp_styles.
+	 *
+	 * @covers AMP_Theme_Support::print_amp_styles()
+	 */
+	public function test_print_amp_styles() {
+		$this->markTestIncomplete();
+	}
+
 	/**
 	 * Test ensure_required_markup().
 	 *
@@ -548,6 +574,170 @@ public function test_ensure_required_markup( $script, $expected ) {
 		$this->assertEquals( $expected, substr_count( $dom->saveHTML(), 'schema.org' ) );
 	}
 
+	/**
+	 * Test dequeue_customize_preview_scripts.
+	 *
+	 * @covers AMP_Theme_Support::dequeue_customize_preview_scripts()
+	 */
+	public function test_dequeue_customize_preview_scripts() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test start_output_buffering.
+	 *
+	 * @covers AMP_Theme_Support::start_output_buffering()
+	 */
+	public function test_start_output_buffering() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test finish_output_buffering.
+	 *
+	 * @covers AMP_Theme_Support::finish_output_buffering()
+	 */
+	public function test_finish_output_buffering() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test filter_customize_partial_render.
+	 *
+	 * @covers AMP_Theme_Support::filter_customize_partial_render()
+	 */
+	public function test_filter_customize_partial_render() {
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test prepare_response.
+	 *
+	 * @global WP_Widget_Factory $wp_widget_factory
+	 * @global WP_Scripts $wp_scripts
+	 * @covers AMP_Theme_Support::prepare_response()
+	 */
+	public function test_prepare_response() {
+		global $wp_widget_factory, $wp_scripts;
+		$wp_scripts = null;
+
+		add_theme_support( 'amp' );
+		AMP_Theme_Support::init();
+		AMP_Theme_Support::finish_init();
+		$wp_widget_factory = new WP_Widget_Factory();
+		wp_widgets_init();
+
+		add_action( 'wp_enqueue_scripts', function() {
+			wp_enqueue_script( 'amp-list' );
+		} );
+		add_action( 'wp_footer', function() {
+			wp_print_scripts( 'amp-mathml' );
+			?>
+			<amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml>
+			<?php
+		}, 1 );
+
+		ob_start();
+		?>
+		<!DOCTYPE html>
+		<html amp <?php language_attributes(); ?>>
+			<head>
+				<?php wp_head(); ?>
+				<script data-head>document.write('Illegal');</script>
+			</head>
+			<body>
+				<img width="100" height="100" src="https://example.com/test.png">
+				<audio width="400" height="300" src="https://example.com/audios/myaudio.mp3"></audio>
+				<amp-ad type="a9"
+					width="300"
+					height="250"
+					data-aax_size="300x250"
+					data-aax_pubname="test123"
+					data-aax_src="302"></amp-ad>
+				<?php wp_footer(); ?>
+
+				<button onclick="alert('Illegal');">no-onclick</button>
+
+				<style>body { background: black; }</style>
+			</body>
+		</html>
+		<?php
+		$original_html  = trim( ob_get_clean() );
+		$removed_nodes  = array();
+		$sanitized_html = AMP_Theme_Support::prepare_response( $original_html, array(
+			'validation_error_callback' => function( $removed ) use ( &$removed_nodes ) {
+				$removed_nodes[ $removed['node']->nodeName ] = $removed['node'];
+			},
+		) );
+
+		$this->assertContains( '<meta charset="' . get_bloginfo( 'charset' ) . '">', $sanitized_html );
+		$this->assertContains( '<meta name="viewport" content="width=device-width,minimum-scale=1">', $sanitized_html );
+		$this->assertContains( '<style amp-boilerplate>', $sanitized_html );
+		$this->assertContains( '<style amp-custom>body { background: black; }', $sanitized_html );
+		$this->assertContains( '<script type="text/javascript" src="https://cdn.ampproject.org/v0.js" async></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+		$this->assertContains( '<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-list-latest.js" async custom-element="amp-list"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+		$this->assertContains( '<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-mathml-latest.js" async custom-element="amp-mathml"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+		$this->assertContains( '<meta name="generator" content="AMP Plugin', $sanitized_html );
+
+		$this->assertNotContains( '<img', $sanitized_html );
+		$this->assertContains( '<amp-img', $sanitized_html );
+
+		$this->assertNotContains( '<audio', $sanitized_html );
+		$this->assertContains( '<amp-audio', $sanitized_html );
+
+		// Note these are single-quoted because they are injected after the DOM has been re-serialized, so the type and src attributes come from WP_Scripts::do_item().
+		$this->assertContains( '<script type=\'text/javascript\' src=\'https://cdn.ampproject.org/v0/amp-audio-latest.js\' async custom-element="amp-audio"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+		$this->assertContains( '<script type=\'text/javascript\' src=\'https://cdn.ampproject.org/v0/amp-ad-latest.js\' async custom-element="amp-ad"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+
+		$this->assertContains( '<button>no-onclick</button>', $sanitized_html );
+		$this->assertCount( 3, $removed_nodes );
+		$this->assertInstanceOf( 'DOMElement', $removed_nodes['script'] );
+		$this->assertInstanceOf( 'DOMAttr', $removed_nodes['onclick'] );
+	}
+
+	/**
+	 * Test prepare_response for bad/non-HTML.
+	 *
+	 * @covers AMP_Theme_Support::prepare_response()
+	 */
+	public function test_prepare_response_bad_html() {
+		add_theme_support( 'amp' );
+		AMP_Theme_Support::init();
+
+		// JSON.
+		$input = '{"success":true}';
+		$this->assertEquals( $input, AMP_Theme_Support::prepare_response( $input ) );
+
+		// Nothing, for redirect.
+		$input = '';
+		$this->assertEquals( $input, AMP_Theme_Support::prepare_response( $input ) );
+
+		// HTML, but very stripped down.
+		$input  = '<html>Hello</html>';
+		$output = AMP_Theme_Support::prepare_response( $input );
+		$this->assertContains( '<html amp', $output );
+	}
+
+	/**
+	 * Test prepare_response to inject html[amp] attribute and ensure HTML5 doctype.
+	 *
+	 * @covers AMP_Theme_Support::prepare_response()
+	 */
+	public function test_prepare_response_to_add_html5_doctype_and_amp_attribute() {
+		add_theme_support( 'amp' );
+		AMP_Theme_Support::init();
+		ob_start();
+		?>
+		<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+		<html><head><?php wp_head(); ?></head><body><?php wp_footer(); ?></body></html>
+		<?php
+		$original_html  = trim( ob_get_clean() );
+		$sanitized_html = AMP_Theme_Support::prepare_response( $original_html );
+
+		$this->assertStringStartsWith( '<!DOCTYPE html>', $sanitized_html );
+		$this->assertContains( '<html amp', $sanitized_html );
+	}
+
 	/**
 	 * Data provider for test_ensure_required_markup.
 	 *

From 7232ab57fecc8bf7c09a1945189abdba20e2d296 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 21 Mar 2018 21:08:43 -0700
Subject: [PATCH 03/22] Remove needless amp prefix from set_comments_walker
 method

---
 includes/class-amp-theme-support.php   | 2 +-
 tests/test-class-amp-theme-support.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 1cfcc4f74cf..26ef3baa113 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -631,7 +631,7 @@ public static function register_content_embed_handlers() {
 	 * @param array $args the args for the comments list..
 	 * @return array Args to return.
 	 */
-	public static function amp_set_comments_walker( $args ) {
+	public static function set_comments_walker( $args ) {
 		$amp_walker     = new AMP_Comment_Walker();
 		$args['walker'] = $amp_walker;
 		// Add reverse order here as well, in case theme overrides it.
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index a7a42dc17a5..05d853c431c 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -436,11 +436,11 @@ public function test_register_content_embed_handlers() {
 	}
 
 	/**
-	 * Test amp_set_comments_walker.
+	 * Test set_comments_walker.
 	 *
-	 * @covers AMP_Theme_Support::amp_set_comments_walker()
+	 * @covers AMP_Theme_Support::set_comments_walker()
 	 */
-	public function test_amp_set_comments_walker() {
+	public function test_set_comments_walker() {
 		$this->markTestIncomplete();
 	}
 

From b3c6402a88b610d9287523f858d3bb0552db7bda Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Fri, 23 Mar 2018 21:26:01 -0700
Subject: [PATCH 04/22] Add test for AMP_Theme_Support::set_comments_walker()

---
 tests/test-class-amp-theme-support.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 05d853c431c..ae9472a1fc1 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -441,7 +441,10 @@ public function test_register_content_embed_handlers() {
 	 * @covers AMP_Theme_Support::set_comments_walker()
 	 */
 	public function test_set_comments_walker() {
-		$this->markTestIncomplete();
+		$args = AMP_Theme_Support::set_comments_walker( array(
+			'walker' => null,
+		) );
+		$this->assertInstanceOf( 'AMP_Comment_Walker', $args['walker'] );
 	}
 
 	/**

From 97dcdf1d35d235d8c7f3805faa9527510d338f0c Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 26 Mar 2018 11:24:25 -0700
Subject: [PATCH 05/22] Skip printing paths-scope because it causes push builds
 to be truncated (and fail) for unknown reason

See https://github.com/xwp/wp-dev-lib/pull/270
---
 .dev-lib | 1 +
 dev-lib  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.dev-lib b/.dev-lib
index 6549fa32c46..663a5ce0043 100644
--- a/.dev-lib
+++ b/.dev-lib
@@ -2,6 +2,7 @@ PATH_EXCLUDES_PATTERN=includes/lib/
 DEFAULT_BASE_BRANCH=develop
 ASSETS_DIR=wp-assets
 PROJECT_SLUG=amp
+SKIP_ECHO_PATHS_SCOPE=1
 
 function after_wp_install {
     echo "Installing REST API..."
diff --git a/dev-lib b/dev-lib
index 223f238eb74..f5161dd0bfb 160000
--- a/dev-lib
+++ b/dev-lib
@@ -1 +1 @@
-Subproject commit 223f238eb74dd2c65892b8fb6c1c06ae04e95234
+Subproject commit f5161dd0bfb184a8be7574b47192741d50e7520a

From 4c17c670a55c3ec0ef038b44638071af4e3d46fe Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 27 Mar 2018 16:05:15 -0600
Subject: [PATCH 06/22] Add 2 PHPUnit tests for AMP_Theme_Support.

Test init() and redirect_canonical_amp().
@todo continue with these,
and consider a better way to test
redirect_canonical_amp().
That uses wp_safe_redirect,
which throws an error.
---
 tests/test-class-amp-theme-support.php | 48 ++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index ae9472a1fc1..f8dc44137de 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -13,6 +13,13 @@
  */
 class Test_AMP_Theme_Support extends WP_UnitTestCase {
 
+	/**
+	 * The name of the tested class.
+	 *
+	 * @var string
+	 */
+	const TESTED_CLASS = 'AMP_Theme_Support';
+
 	/**
 	 * After a test method runs, reset any state in WordPress the test method might have changed.
 	 *
@@ -37,7 +44,37 @@ public function tearDown() {
 	 * @covers AMP_Theme_Support::finish_init()
 	 */
 	public function test_init() {
-		$this->markTestIncomplete();
+		$_REQUEST['__amp_source_origin'] = 'foo';
+		$_GET['__amp_source_origin']     = 'foo';
+		AMP_Theme_Support::init();
+		$this->assertNotEquals( 10, has_action( 'widgets_init', array( self::TESTED_CLASS, 'register_widgets' ) ) );
+
+		// Ensure that purge_amp_query_vars() didn't execute.
+		$this->assertTrue( isset( $_REQUEST['__amp_source_origin'] ) ); // WPCS: CSRF ok.
+
+		add_theme_support( 'amp' );
+		AMP_Theme_Support::init();
+		$this->assertEquals( 10, has_action( 'widgets_init', array( self::TESTED_CLASS, 'register_widgets' ) ) );
+		$this->assertEquals( PHP_INT_MAX, has_action( 'wp', array( self::TESTED_CLASS, 'finish_init' ) ) );
+		$this->assertFalse( isset( $_REQUEST['__amp_source_origin'] ) ); // WPCS: CSRF ok.
+
+		add_theme_support( 'amp', 'invalid_argumnet_type' );
+		try {
+			AMP_Theme_Support::init();
+		} catch ( Exception $exception ) {
+			$e = $exception;
+		}
+		$this->assertEquals( 'Expected AMP theme support arg to be array.', $e->getMessage() );
+
+		add_theme_support( 'amp', array(
+			'invalid_param_key' => array(),
+		) );
+		try {
+			AMP_Theme_Support::init();
+		} catch ( Exception $exception ) {
+			$e = $exception;
+		}
+		$this->assertEquals( 'Expected AMP theme support to only have template_dir and/or available_callback.', $e->getMessage() );
 	}
 
 	/**
@@ -46,7 +83,14 @@ public function test_init() {
 	 * @covers AMP_Theme_Support::redirect_canonical_amp()
 	 */
 	public function test_redirect_canonical_amp() {
-		$this->markTestIncomplete();
+		set_query_var( amp_get_slug(), 1 );
+		try {
+			AMP_Theme_Support::redirect_canonical_amp();
+		} catch ( Exception $exception ) {
+			$e = $exception;
+		}
+		// wp_safe_redirect() modifies the headers, and causes an error.
+		$this->assertTrue( isset( $e ) );
 	}
 
 	/**

From 4d70aa96f40acfc58afa14ca6701397e658bbb36 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 27 Mar 2018 16:30:25 -0600
Subject: [PATCH 07/22] Test 2 more methods in AMP_Theme_Support.

is_customize_preview_iframe() and
register_paired_hooks().
---
 tests/test-class-amp-theme-support.php | 27 ++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index f8dc44137de..575dc485d46 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -34,6 +34,9 @@ public function tearDown() {
 		$_SERVER['QUERY_STRING'] = '';
 		unset( $_SERVER['REQUEST_URI'] );
 		unset( $_SERVER['REQUEST_METHOD'] );
+		if ( isset( $GLOBALS['wp_customize'] ) ) {
+			$GLOBALS['wp_customize']->stop_previewing_theme();
+		}
 		AMP_Theme_Support::$headers_sent = array();
 	}
 
@@ -146,7 +149,15 @@ public function test_is_paired_available() {
 	 * @covers AMP_Theme_Support::is_customize_preview_iframe()
 	 */
 	public function test_is_customize_preview_iframe() {
-		$this->markTestIncomplete();
+		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
+		$GLOBALS['wp_customize'] = new WP_Customize_Manager();
+		$this->assertFalse( AMP_Theme_Support::is_customize_preview_iframe() );
+		$GLOBALS['wp_customize'] = new WP_Customize_Manager( array(
+			'messenger_channel' => 'baz',
+		) );
+		$this->assertFalse( AMP_Theme_Support::is_customize_preview_iframe() );
+		$GLOBALS['wp_customize']->start_previewing_theme();
+		$this->assertTrue( AMP_Theme_Support::is_customize_preview_iframe() );
 	}
 
 	/**
@@ -155,7 +166,19 @@ public function test_is_customize_preview_iframe() {
 	 * @covers AMP_Theme_Support::register_paired_hooks()
 	 */
 	public function test_register_paired_hooks() {
-		$this->markTestIncomplete();
+		$template_types = array(
+			'paged',
+			'index',
+			'404',
+			'archive',
+			'author',
+			'category',
+		);
+		AMP_Theme_Support::register_paired_hooks();
+		foreach ( $template_types as $template_type ) {
+			$this->assertEquals( 10, has_filter( "{$template_type}_template_hierarchy", array( self::TESTED_CLASS, 'filter_paired_template_hierarchy' ) ) );
+		}
+		$this->assertEquals( 100, has_filter( 'template_include', array( self::TESTED_CLASS, 'filter_paired_template_include' ) ) );
 	}
 
 	/**

From ac6cac1b47520f567785bf9ba53a7d3f786d612b Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 27 Mar 2018 17:19:18 -0600
Subject: [PATCH 08/22] Test 3 more methods in AMP_Theme_Support.

Test add_hooks, send_header(), and
register_content_embed_handlers().
---
 tests/test-class-amp-theme-support.php | 46 ++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 575dc485d46..8f2815c7231 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -187,7 +187,29 @@ public function test_register_paired_hooks() {
 	 * @covers AMP_Theme_Support::add_hooks()
 	 */
 	public function test_add_hooks() {
-		$this->markTestIncomplete();
+		AMP_Theme_Support::add_hooks();
+		$this->assertFalse( has_action( 'wp_head', 'wp_post_preview_js' ) );
+		$this->assertFalse( has_action( 'wp_head', 'print_emoji_detection_script' ) );
+		$this->assertFalse( has_action( 'wp_print_styles', 'print_emoji_styles' ) );
+		$this->assertFalse( has_action( 'wp_head', 'wp_oembed_add_host_js' ) );
+
+		$this->assertEquals( 0, has_action( 'wp_print_styles', array( self::TESTED_CLASS, 'print_amp_styles' ) ) );
+		$this->assertEquals( 20, has_action( 'wp_head', 'amp_add_generator_metadata' ) );
+		$this->assertEquals( 20, has_action( 'wp_head', 'amp_add_generator_metadata' ) );
+		$this->assertEquals( 10, has_action( 'wp_enqueue_scripts', array( self::TESTED_CLASS, 'enqueue_assets' ) ) );
+
+		$this->assertFalse( has_action( 'wp_enqueue_scripts', array( self::TESTED_CLASS, 'dequeue_customize_preview_scripts' ) ) );
+		$this->assertEquals( 10, has_filter( 'customize_partial_render', array( self::TESTED_CLASS, 'filter_customize_partial_render' ) ) );
+		$this->assertEquals( 10, has_action( 'wp_footer', 'amp_print_analytics' ) );
+		$this->assertEquals( 100, has_filter( 'show_admin_bar', '__return_false' ) );
+		$this->assertEquals( 0, has_action( 'template_redirect', array( self::TESTED_CLASS, 'start_output_buffering' ) ) );
+
+		$this->assertEquals( PHP_INT_MAX, has_filter( 'wp_list_comments_args', array( self::TESTED_CLASS, 'amp_set_comments_walker' ) ) );
+		$this->assertEquals( 10, has_filter( 'comment_form_defaults', array( self::TESTED_CLASS, 'filter_comment_form_defaults' ) ) );
+		$this->assertEquals( 10, has_filter( 'comment_reply_link', array( self::TESTED_CLASS, 'filter_comment_reply_link' ) ) );
+		$this->assertEquals( 10, has_filter( 'cancel_comment_reply_link', array( self::TESTED_CLASS, 'filter_cancel_comment_reply_link' ) ) );
+		$this->assertEquals( 100, has_action( 'comment_form', array( self::TESTED_CLASS, 'amend_comment_form' ) ) );
+		$this->assertFalse( has_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' ) );
 	}
 
 	/**
@@ -243,7 +265,17 @@ public function test_purge_amp_query_vars() {
 	 * @covers AMP_Theme_Support::send_header()
 	 */
 	public function test_send_header() {
-		$this->markTestIncomplete();
+		$name         = 'foo';
+		$value        = 'bar';
+		$args         = array(
+			'X-Example' => 'baz',
+		);
+		$default_args = array(
+			'replace'     => true,
+			'status_code' => null,
+		);
+		AMP_Theme_Support::send_header( $name, $value, $args );
+		$this->assertEquals( array_merge( compact( 'name', 'value' ), $args, $default_args ), reset( AMP_Theme_Support::$headers_sent ) );
 	}
 
 	/**
@@ -499,7 +531,15 @@ public function test_register_widgets() {
 	 * @covers AMP_Theme_Support::register_content_embed_handlers()
 	 */
 	public function test_register_content_embed_handlers() {
-		$this->markTestIncomplete();
+		$embed_handlers = AMP_Theme_Support::register_content_embed_handlers();
+		foreach ( $embed_handlers as $embed_handler ) {
+			$this->assertTrue( is_subclass_of( $embed_handler, 'AMP_Base_Embed_Handler' ) );
+			$reflection = new ReflectionObject( $embed_handler );
+			$args       = $reflection->getProperty( 'args' );
+			$args->setAccessible( true );
+			$property = $args->getValue( $embed_handler );
+			$this->assertEquals( AMP_Post_Template::CONTENT_MAX_WIDTH, $property['content_max_width'] );
+		}
 	}
 
 	/**

From 92ada3b364f28e7caff9d357056c538a64464ec1 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 27 Mar 2018 18:14:44 -0600
Subject: [PATCH 09/22] Test 3 more methods in AMP_Theme_Support.

Test methods related to AMP templates,
and get_current_canonical_url().
---
 tests/test-class-amp-theme-support.php | 43 ++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 8f2815c7231..187a100eea9 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -602,7 +602,19 @@ public function test_add_amp_comment_form_templates() {
 	 * @covers AMP_Theme_Support::filter_paired_template_hierarchy()
 	 */
 	public function test_filter_paired_template_hierarchy() {
-		$this->markTestIncomplete();
+		$template_dir = 'amp-templates';
+		add_theme_support( 'amp', array(
+			'template_dir' => $template_dir,
+		) );
+		$templates          = array(
+			'single-post-example.php',
+			'single-post.php',
+			'single.php',
+		);
+		$filtered_templates = AMP_Theme_Support::filter_paired_template_hierarchy( $templates );
+		foreach ( $filtered_templates as $key => $filtered_template ) {
+			$this->assertEquals( $template_dir . '/' . $templates[ $key ], $filtered_template );
+		}
 	}
 
 	/**
@@ -611,7 +623,19 @@ public function test_filter_paired_template_hierarchy() {
 	 * @covers AMP_Theme_Support::filter_paired_template_include()
 	 */
 	public function test_filter_paired_template_include() {
-		$this->markTestIncomplete();
+		$template_dir = 'amp-templates';
+		$template     = 'single.php';
+		add_theme_support( 'amp', array(
+			'template_dir' => $template_dir,
+		) );
+		$this->assertEquals( $template, AMP_Theme_Support::filter_paired_template_include( $template ) );
+		remove_theme_support( 'amp' );
+		try {
+			AMP_Theme_Support::filter_paired_template_include( $template );
+		} catch ( Exception $exception ) {
+			$e = $exception;
+		}
+		$this->assertTrue( isset( $e ) );
 	}
 
 	/**
@@ -620,7 +644,20 @@ public function test_filter_paired_template_include() {
 	 * @covers AMP_Theme_Support::get_current_canonical_url()
 	 */
 	public function test_get_current_canonical_url() {
-		$this->markTestIncomplete();
+		global $post, $wp;
+		$home_url = home_url( '/' );
+		$this->assertEquals( $home_url, AMP_Theme_Support::get_current_canonical_url() );
+
+		$added_query_vars = array(
+			'foo' => 'bar',
+		);
+		$wp->query_vars   = $added_query_vars;
+		$this->assertEquals( add_query_arg( $added_query_vars, $home_url ), AMP_Theme_Support::get_current_canonical_url() );
+
+		$post = $this->factory()->post->create_and_get(); // WPCS: global override ok.
+		$this->go_to( get_permalink( $post ) );
+		$this->assertEquals( wp_get_canonical_url(), AMP_Theme_Support::get_current_canonical_url() );
+
 	}
 
 	/**

From 93bf0439b0780d70eec6b494b89e789b41c8fa90 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 27 Mar 2018 18:30:29 -0600
Subject: [PATCH 10/22] Add comment form-related PHPUnit tests.

Test 2 methods:
get_comment_form_state_id() and
filter_comment_form_defaults().
---
 tests/test-class-amp-theme-support.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 187a100eea9..c22314d7f91 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -666,7 +666,10 @@ public function test_get_current_canonical_url() {
 	 * @covers AMP_Theme_Support::get_comment_form_state_id()
 	 */
 	public function test_get_comment_form_state_id() {
-		$this->markTestIncomplete();
+		$post_id = 54;
+		$this->assertEquals( 'commentform_post_' . $post_id, AMP_Theme_Support::get_comment_form_state_id( $post_id ) );
+		$post_id = 91542;
+		$this->assertEquals( 'commentform_post_' . $post_id, AMP_Theme_Support::get_comment_form_state_id( $post_id ) );
 	}
 
 	/**
@@ -675,7 +678,19 @@ public function test_get_comment_form_state_id() {
 	 * @covers AMP_Theme_Support::filter_comment_form_defaults()
 	 */
 	public function test_filter_comment_form_defaults() {
-		$this->markTestIncomplete();
+		global $post;
+		$post           = $this->factory()->post->create_and_get(); // WPCS: global override ok.
+		$title_reply_to = 'Reply To';
+		$title_reply    = 'Reply';
+		$defaults       = AMP_Theme_Support::filter_comment_form_defaults( array(
+			'title_reply_to'      => $title_reply_to,
+			'title_reply'         => $title_reply,
+			'cancel_reply_before' => '',
+			'title_reply_before'  => '',
+		) );
+		$this->assertContains( AMP_Theme_Support::get_comment_form_state_id( get_the_ID() ), $defaults['title_reply_before'] );
+		$this->assertContains( 'replyToName ?', $defaults['title_reply_before'] );
+		$this->assertContains( '</span>', $defaults['cancel_reply_before'] );
 	}
 
 	/**

From 7c704aed4b81ca6bf585d11bd70e4d5f133fb13a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 27 Mar 2018 19:38:38 -0600
Subject: [PATCH 11/22] Remove the conditional around the add_action for
 preview scripts.

There's a check for is_customize_preview() around add_action().
But the callback dequeue_customize_preview_scripts()
has its own check for is_customize_preview_iframe().
And that has a check for is_customize_preview().
So this ensures that the body of the callback
never runs.
Maybe I misread the intent of this, though.
This also adds unit tests.
---
 includes/class-amp-theme-support.php   |  4 +-
 tests/test-class-amp-theme-support.php | 70 ++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 26ef3baa113..6ba3b507f30 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -225,9 +225,7 @@ public static function add_hooks() {
 		add_action( 'wp_head', 'amp_add_generator_metadata', 20 );
 
 		add_action( 'wp_enqueue_scripts', array( __CLASS__, 'enqueue_assets' ) );
-		if ( is_customize_preview() ) {
-			add_action( 'wp_enqueue_scripts', array( __CLASS__, 'dequeue_customize_preview_scripts' ), 1000 );
-		}
+		add_action( 'wp_enqueue_scripts', array( __CLASS__, 'dequeue_customize_preview_scripts' ), 1000 );
 		add_filter( 'customize_partial_render', array( __CLASS__, 'filter_customize_partial_render' ) );
 
 		add_action( 'wp_footer', 'amp_print_analytics' );
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index c22314d7f91..38a35156380 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -198,7 +198,7 @@ public function test_add_hooks() {
 		$this->assertEquals( 20, has_action( 'wp_head', 'amp_add_generator_metadata' ) );
 		$this->assertEquals( 10, has_action( 'wp_enqueue_scripts', array( self::TESTED_CLASS, 'enqueue_assets' ) ) );
 
-		$this->assertFalse( has_action( 'wp_enqueue_scripts', array( self::TESTED_CLASS, 'dequeue_customize_preview_scripts' ) ) );
+		$this->assertEquals( 1000, has_action( 'wp_enqueue_scripts', array( self::TESTED_CLASS, 'dequeue_customize_preview_scripts' ) ) );
 		$this->assertEquals( 10, has_filter( 'customize_partial_render', array( self::TESTED_CLASS, 'filter_customize_partial_render' ) ) );
 		$this->assertEquals( 10, has_action( 'wp_footer', 'amp_print_analytics' ) );
 		$this->assertEquals( 100, has_filter( 'show_admin_bar', '__return_false' ) );
@@ -699,7 +699,28 @@ public function test_filter_comment_form_defaults() {
 	 * @covers AMP_Theme_Support::filter_comment_reply_link()
 	 */
 	public function test_filter_comment_reply_link() {
-		$this->markTestIncomplete();
+		global $post;
+		$post          = $this->factory()->post->create_and_get(); // WPCS: global override ok.
+		$comment       = $this->factory()->comment->create_and_get();
+		$link          = get_comment_link( $comment );
+		$respond_id    = '5234';
+		$reply_text    = 'Reply';
+		$reply_to_text = 'Reply to';
+		$args          = compact( 'respond_id', 'reply_text', 'reply_to_text' );
+		$comment       = $this->factory()->comment->create_and_get();
+		update_option( 'comment_registration', true );
+		$filtered_link = AMP_Theme_Support::filter_comment_reply_link( $link, $args, $comment );
+		$this->assertEquals( $link, $filtered_link );
+		update_option( 'comment_registration', false );
+
+		$filtered_link = AMP_Theme_Support::filter_comment_reply_link( $link, $args, $comment );
+		$this->assertContains( AMP_Theme_Support::get_comment_form_state_id( get_the_ID() ), $filtered_link );
+		$this->assertContains( $comment->comment_author, $filtered_link );
+		$this->assertContains( $comment->comment_ID, $filtered_link );
+		$this->assertContains( 'tap:AMP.setState', $filtered_link );
+		$this->assertContains( $reply_text, $filtered_link );
+		$this->assertContains( $reply_to_text, $filtered_link );
+		$this->assertContains( $respond_id, $filtered_link );
 	}
 
 	/**
@@ -708,7 +729,23 @@ public function test_filter_comment_reply_link() {
 	 * @covers AMP_Theme_Support::filter_cancel_comment_reply_link()
 	 */
 	public function test_filter_cancel_comment_reply_link() {
-		$this->markTestIncomplete();
+		global $post;
+		$post                   = $this->factory()->post->create_and_get(); // WPCS: global override ok.
+		$url                    = get_permalink( $post );
+		$_SERVER['REQUEST_URI'] = $url;
+		$this->factory()->comment->create_and_get();
+		$formatted_link = get_cancel_comment_reply_link();
+		$link           = remove_query_arg( 'replytocom' );
+		$text           = 'Cancel your reply';
+		$filtered_link  = AMP_Theme_Support::filter_cancel_comment_reply_link( $formatted_link, $link, $text );
+		$this->assertContains( $url, $filtered_link );
+		$this->assertContains( $text, $filtered_link );
+		$this->assertContains( '<a id="cancel-comment-reply-link"', $filtered_link );
+		$this->assertContains( '.values.comment_parent ==', $filtered_link );
+		$this->assertContains( 'tap:AMP.setState(', $filtered_link );
+
+		$filtered_link_no_text_passed = AMP_Theme_Support::filter_cancel_comment_reply_link( $formatted_link, $link, '' );
+		$this->assertContains( 'Click here to cancel reply.', $filtered_link_no_text_passed );
 	}
 
 	/**
@@ -717,7 +754,11 @@ public function test_filter_cancel_comment_reply_link() {
 	 * @covers AMP_Theme_Support::print_amp_styles()
 	 */
 	public function test_print_amp_styles() {
-		$this->markTestIncomplete();
+		ob_start();
+		AMP_Theme_Support::print_amp_styles();
+		$output = ob_get_clean();
+		$this->assertContains( amp_get_boilerplate_code(), $output );
+		$this->assertContains( '<style amp-custom></style>', $output );
 	}
 
 	/**
@@ -742,7 +783,26 @@ public function test_ensure_required_markup( $script, $expected ) {
 	 * @covers AMP_Theme_Support::dequeue_customize_preview_scripts()
 	 */
 	public function test_dequeue_customize_preview_scripts() {
-		$this->markTestIncomplete();
+		// Ensure AMP_Theme_Support::is_customize_preview_iframe() is true.
+		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
+		$GLOBALS['wp_customize'] = new WP_Customize_Manager( array(
+			'messenger_channel' => 'baz',
+		) );
+		$GLOBALS['wp_customize']->start_previewing_theme();
+		$customize_preview = 'customize-preview';
+		$preview_style     = 'example-preview-style';
+		wp_enqueue_style( $preview_style, home_url( '/' ), array( $customize_preview ) );
+		AMP_Theme_Support::dequeue_customize_preview_scripts();
+		$this->assertTrue( wp_style_is( $preview_style ) );
+		$this->assertTrue( wp_style_is( $customize_preview ) );
+
+		wp_enqueue_style( $preview_style, home_url( '/' ), array( $customize_preview ) );
+		wp_enqueue_style( $customize_preview );
+		// Ensure AMP_Theme_Support::is_customize_preview_iframe() is false.
+		$GLOBALS['wp_customize'] = new WP_Customize_Manager();
+		AMP_Theme_Support::dequeue_customize_preview_scripts();
+		$this->assertFalse( wp_style_is( $preview_style ) );
+		$this->assertFalse( wp_style_is( $customize_preview ) );
 	}
 
 	/**

From f90c40a7afa6cf3825fb1afd5b07377628a4e5c6 Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Wed, 28 Mar 2018 08:01:07 +0200
Subject: [PATCH 12/22] Remove test for renamed method, as test already exists.

---
 tests/test-class-amp-theme-support.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 38a35156380..0644cd23bc2 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -587,15 +587,6 @@ public function test_amend_comment_form() {
 		$this->assertContains( '<div submit-error>', $output );
 	}
 
-	/**
-	 * Test add_amp_comment_form_templates.
-	 *
-	 * @covers AMP_Theme_Support::add_amp_comment_form_templates()
-	 */
-	public function test_add_amp_comment_form_templates() {
-		$this->markTestIncomplete();
-	}
-
 	/**
 	 * Test filter_paired_template_hierarchy.
 	 *

From 912ea33c13d66683b62d729fef2790c8dc2ddfbe Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Wed, 28 Mar 2018 08:49:36 +0200
Subject: [PATCH 13/22] Test start and finish output buffers.

---
 tests/test-class-amp-theme-support.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 0644cd23bc2..aeba120fd34 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -802,7 +802,14 @@ public function test_dequeue_customize_preview_scripts() {
 	 * @covers AMP_Theme_Support::start_output_buffering()
 	 */
 	public function test_start_output_buffering() {
-		$this->markTestIncomplete();
+		$ob_level = ob_get_level();
+		AMP_Theme_Support::start_output_buffering();
+		$this->assertTrue( ob_get_level() > $ob_level );
+		// End output buffer.
+		if ( ob_get_level() > $ob_level ) {
+			ob_get_clean();
+		}
+		$this->assertNotEquals( 10, has_action( 'shutdown', array( self::TESTED_CLASS, 'finish_output_buffering' ) ) );
 	}
 
 	/**
@@ -811,7 +818,15 @@ public function test_start_output_buffering() {
 	 * @covers AMP_Theme_Support::finish_output_buffering()
 	 */
 	public function test_finish_output_buffering() {
-		$this->markTestIncomplete();
+		// start first layer buffer.
+		ob_start();
+		AMP_Theme_Support::start_output_buffering();
+		echo '<test-text>';
+		AMP_Theme_Support::finish_output_buffering();
+		// get first layer buffer.
+		$output = ob_get_clean();
+
+		$this->assertContains( '<test-text></test-text>', $output );
 	}
 
 	/**

From e4dedbbd3e7018279c2ada8f5c0c662a3499ea35 Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Wed, 28 Mar 2018 09:12:56 +0200
Subject: [PATCH 14/22] Add test for partial render and flesh out buffer tests.

---
 tests/test-class-amp-theme-support.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index aeba120fd34..34af5aabbde 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -818,15 +818,23 @@ public function test_start_output_buffering() {
 	 * @covers AMP_Theme_Support::finish_output_buffering()
 	 */
 	public function test_finish_output_buffering() {
+
+		add_theme_support( 'amp' );
+		AMP_Theme_Support::init();
+		AMP_Theme_Support::finish_init();
+
 		// start first layer buffer.
 		ob_start();
 		AMP_Theme_Support::start_output_buffering();
-		echo '<test-text>';
+		echo '<img src="test.png"><script data-test>document.write(\'Illegal\');</script>';
 		AMP_Theme_Support::finish_output_buffering();
 		// get first layer buffer.
 		$output = ob_get_clean();
 
-		$this->assertContains( '<test-text></test-text>', $output );
+		$this->assertContains( '<html amp', $output );
+		$this->assertContains( '<amp-img src="test.png"', $output );
+		$this->assertNotContains( '<script data-test', $output );
+
 	}
 
 	/**
@@ -835,7 +843,17 @@ public function test_finish_output_buffering() {
 	 * @covers AMP_Theme_Support::filter_customize_partial_render()
 	 */
 	public function test_filter_customize_partial_render() {
-		$this->markTestIncomplete();
+
+		add_theme_support( 'amp' );
+		AMP_Theme_Support::init();
+		AMP_Theme_Support::finish_init();
+
+		$partial = '<img src="test.png"><script data-head>document.write(\'Illegal\');</script>';
+		$output  = AMP_Theme_Support::filter_customize_partial_render( $partial );
+		$this->assertContains( '<amp-img src="test.png"', $output );
+		$this->assertNotContains( '<script', $output );
+		$this->assertNotContains( '<html', $output );
+
 	}
 
 	/**

From ce68491288c0fb1b6cf99c3bdae55a68a9e2ee53 Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Wed, 28 Mar 2018 10:44:29 +0200
Subject: [PATCH 15/22] Correct assertion on has_action for shutdown

---
 tests/test-class-amp-theme-support.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 34af5aabbde..bda834d1a0e 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -802,14 +802,20 @@ public function test_dequeue_customize_preview_scripts() {
 	 * @covers AMP_Theme_Support::start_output_buffering()
 	 */
 	public function test_start_output_buffering() {
+
+		add_theme_support( 'amp' );
+		AMP_Theme_Support::init();
+		AMP_Theme_Support::finish_init();
+
 		$ob_level = ob_get_level();
 		AMP_Theme_Support::start_output_buffering();
+
+		$this->assertEquals( 0, has_action( 'shutdown', array( self::TESTED_CLASS, 'finish_output_buffering' ) ) );
 		$this->assertTrue( ob_get_level() > $ob_level );
 		// End output buffer.
 		if ( ob_get_level() > $ob_level ) {
 			ob_get_clean();
 		}
-		$this->assertNotEquals( 10, has_action( 'shutdown', array( self::TESTED_CLASS, 'finish_output_buffering' ) ) );
 	}
 
 	/**

From 9caf29b98347559edde6a5cd400e4bb0b901d08b Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Wed, 28 Mar 2018 11:28:20 +0200
Subject: [PATCH 16/22] use function_exists instead of extension_loaded to
 simplify testing.

---
 includes/class-amp-theme-support.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 6ba3b507f30..dafb81d3fbb 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -997,7 +997,7 @@ public static function start_output_buffering() {
 		 * Sites with New Relic will need to specially configure New Relic for AMP:
 		 * https://docs.newrelic.com/docs/browser/new-relic-browser/installation/monitor-amp-pages-new-relic-browser
 		 */
-		if ( extension_loaded( 'newrelic' ) ) {
+		if ( function_exists( 'newrelic_disable_autorum' ) ) {
 			newrelic_disable_autorum();
 		}
 

From cdb6bba68e326e763c6ff828e3031bb6d3ddddfe Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Wed, 28 Mar 2018 11:38:07 +0200
Subject: [PATCH 17/22] define newrelic_disable_autorum to allow testing

---
 tests/test-class-amp-theme-support.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index bda834d1a0e..d852c92c507 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -803,6 +803,15 @@ public function test_dequeue_customize_preview_scripts() {
 	 */
 	public function test_start_output_buffering() {
 
+		if ( ! function_exists( 'newrelic_disable_autorum ' ) ) {
+			/**
+			 * Define newrelic_disable_autorum to allow passing line.
+			 */
+			function newrelic_disable_autorum() {
+				return true;
+			}
+		}
+
 		add_theme_support( 'amp' );
 		AMP_Theme_Support::init();
 		AMP_Theme_Support::finish_init();

From 1b75faeaaba4ca55440290fd05f91db38892ed76 Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Wed, 28 Mar 2018 12:13:55 +0200
Subject: [PATCH 18/22] more coverage for intercept_post_request_redirect

---
 tests/test-class-amp-theme-support.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index d852c92c507..144e78b039b 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -405,7 +405,7 @@ public function test_handle_wp_die() {
 	public function test_intercept_post_request_redirect() {
 
 		add_theme_support( 'amp' );
-		$url = home_url( '/', 'https' );
+		$url = home_url( '', 'https' ) . ':443/?test=true#test';
 
 		add_filter( 'wp_doing_ajax', '__return_true' );
 		add_filter( 'wp_die_ajax_handler', function () {

From 2540e86276670399226f163fc79a91c26f4454eb Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Wed, 28 Mar 2018 16:36:33 -0600
Subject: [PATCH 19/22] Remove extra variable declarations.

These variables are only used once,
so they can simply be passed to the array.
---
 tests/test-class-amp-theme-support.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 144e78b039b..89e0b0ffd28 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -670,12 +670,10 @@ public function test_get_comment_form_state_id() {
 	 */
 	public function test_filter_comment_form_defaults() {
 		global $post;
-		$post           = $this->factory()->post->create_and_get(); // WPCS: global override ok.
-		$title_reply_to = 'Reply To';
-		$title_reply    = 'Reply';
-		$defaults       = AMP_Theme_Support::filter_comment_form_defaults( array(
-			'title_reply_to'      => $title_reply_to,
-			'title_reply'         => $title_reply,
+		$post     = $this->factory()->post->create_and_get(); // WPCS: global override ok.
+		$defaults = AMP_Theme_Support::filter_comment_form_defaults( array(
+			'title_reply_to'      => 'Reply To',
+			'title_reply'         => 'Reply',
 			'cancel_reply_before' => '',
 			'title_reply_before'  => '',
 		) );

From 86f13fb11efff70f650de59e0d941e7b831a59c8 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Wed, 28 Mar 2018 16:49:04 -0600
Subject: [PATCH 20/22] Remove extra phpcs:ignore comments.

There's already a phpcs:disable at the top of the method.
And a phpcs:enable at the bottom.
---
 tests/test-class-amp-theme-support.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 89e0b0ffd28..8b9a2a7efbb 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -218,7 +218,7 @@ public function test_add_hooks() {
 	 * @covers AMP_Theme_Support::purge_amp_query_vars()
 	 */
 	public function test_purge_amp_query_vars() {
-		// phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification
+		// phpcs:disable WordPress.CSRF.NonceVerification.NoNonceVerification
 		$bad_query_vars = array(
 			'amp_latest_update_time' => '1517199956',
 			'__amp_source_origin'    => home_url(),
@@ -232,10 +232,10 @@ public function test_purge_amp_query_vars() {
 
 		remove_action( 'wp', 'amp_maybe_add_actions' );
 		$this->go_to( add_query_arg( $all_query_vars, home_url( '/foo/' ) ) );
-		$_REQUEST = $_GET; // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
+		$_REQUEST = $_GET;
 		foreach ( $all_query_vars as $key => $value ) {
-			$this->assertArrayHasKey( $key, $_GET ); // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
-			$this->assertArrayHasKey( $key, $_REQUEST ); // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
+			$this->assertArrayHasKey( $key, $_GET );
+			$this->assertArrayHasKey( $key, $_REQUEST );
 			$this->assertContains( "$key=$value", $_SERVER['QUERY_STRING'] );
 			$this->assertContains( "$key=$value", $_SERVER['REQUEST_URI'] );
 		}
@@ -245,18 +245,18 @@ public function test_purge_amp_query_vars() {
 		$this->assertEqualSets( AMP_Theme_Support::$purged_amp_query_vars, $bad_query_vars );
 
 		foreach ( $bad_query_vars as $key => $value ) {
-			$this->assertArrayNotHasKey( $key, $_GET ); // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
-			$this->assertArrayNotHasKey( $key, $_REQUEST ); // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
+			$this->assertArrayNotHasKey( $key, $_GET );
+			$this->assertArrayNotHasKey( $key, $_REQUEST );
 			$this->assertNotContains( "$key=$value", $_SERVER['QUERY_STRING'] );
 			$this->assertNotContains( "$key=$value", $_SERVER['REQUEST_URI'] );
 		}
 		foreach ( $ok_query_vars as $key => $value ) {
-			$this->assertArrayHasKey( $key, $_GET ); // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
-			$this->assertArrayHasKey( $key, $_REQUEST ); // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
+			$this->assertArrayHasKey( $key, $_GET );
+			$this->assertArrayHasKey( $key, $_REQUEST );
 			$this->assertContains( "$key=$value", $_SERVER['QUERY_STRING'] );
 			$this->assertContains( "$key=$value", $_SERVER['REQUEST_URI'] );
 		}
-		// phpcs:enable WordPress.Security.NonceVerification.NoNonceVerification
+		// phpcs:enable WordPress.CSRF.NonceVerification.NoNonceVerification
 	}
 
 	/**

From b365e00311618c966dcb97ff90d7e79d8baa5d5c Mon Sep 17 00:00:00 2001
From: David Cramer <david@digilab.co.za>
Date: Thu, 29 Mar 2018 05:40:38 +0200
Subject: [PATCH 21/22] Address issues from CR

---
 includes/class-amp-theme-support.php   | 2 +-
 tests/test-class-amp-theme-support.php | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index dafb81d3fbb..77b4be81e59 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -243,7 +243,7 @@ public static function add_hooks() {
 		add_action( 'template_redirect', array( __CLASS__, 'start_output_buffering' ), 0 );
 
 		// Commenting hooks.
-		add_filter( 'wp_list_comments_args', array( __CLASS__, 'amp_set_comments_walker' ), PHP_INT_MAX );
+		add_filter( 'wp_list_comments_args', array( __CLASS__, 'set_comments_walker' ), PHP_INT_MAX );
 		add_filter( 'comment_form_defaults', array( __CLASS__, 'filter_comment_form_defaults' ) );
 		add_filter( 'comment_reply_link', array( __CLASS__, 'filter_comment_reply_link' ), 10, 4 );
 		add_filter( 'cancel_comment_reply_link', array( __CLASS__, 'filter_cancel_comment_reply_link' ), 10, 3 );
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 8b9a2a7efbb..fed0c25e1dc 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -204,7 +204,7 @@ public function test_add_hooks() {
 		$this->assertEquals( 100, has_filter( 'show_admin_bar', '__return_false' ) );
 		$this->assertEquals( 0, has_action( 'template_redirect', array( self::TESTED_CLASS, 'start_output_buffering' ) ) );
 
-		$this->assertEquals( PHP_INT_MAX, has_filter( 'wp_list_comments_args', array( self::TESTED_CLASS, 'amp_set_comments_walker' ) ) );
+		$this->assertEquals( PHP_INT_MAX, has_filter( 'wp_list_comments_args', array( self::TESTED_CLASS, 'set_comments_walker' ) ) );
 		$this->assertEquals( 10, has_filter( 'comment_form_defaults', array( self::TESTED_CLASS, 'filter_comment_form_defaults' ) ) );
 		$this->assertEquals( 10, has_filter( 'comment_reply_link', array( self::TESTED_CLASS, 'filter_comment_reply_link' ) ) );
 		$this->assertEquals( 10, has_filter( 'cancel_comment_reply_link', array( self::TESTED_CLASS, 'filter_cancel_comment_reply_link' ) ) );
@@ -800,7 +800,6 @@ public function test_dequeue_customize_preview_scripts() {
 	 * @covers AMP_Theme_Support::start_output_buffering()
 	 */
 	public function test_start_output_buffering() {
-
 		if ( ! function_exists( 'newrelic_disable_autorum ' ) ) {
 			/**
 			 * Define newrelic_disable_autorum to allow passing line.
@@ -831,7 +830,6 @@ function newrelic_disable_autorum() {
 	 * @covers AMP_Theme_Support::finish_output_buffering()
 	 */
 	public function test_finish_output_buffering() {
-
 		add_theme_support( 'amp' );
 		AMP_Theme_Support::init();
 		AMP_Theme_Support::finish_init();
@@ -856,7 +854,6 @@ public function test_finish_output_buffering() {
 	 * @covers AMP_Theme_Support::filter_customize_partial_render()
 	 */
 	public function test_filter_customize_partial_render() {
-
 		add_theme_support( 'amp' );
 		AMP_Theme_Support::init();
 		AMP_Theme_Support::finish_init();

From 71b83fcd8c0ecc9491a9d3629be1a9aa666bf008 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Fri, 30 Mar 2018 18:37:37 -0600
Subject: [PATCH 22/22] Fix a failed unit test by setting $wp_styles to null.

Before, merging in 0.7, there was an amp-default <link>.
But test_validate_non_amp_theme() also output that.
And that stored the script in $wp_styles->done.
So it wasn't output again, and the test failed.
So reset $wp_styles, so it gets re-instantiated.
---
 tests/test-class-amp-theme-support.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 5647f6d023d..597375b3990 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -913,8 +913,9 @@ public function test_filter_customize_partial_render() {
 	 * @covers AMP_Theme_Support::prepare_response()
 	 */
 	public function test_prepare_response() {
-		global $wp_widget_factory, $wp_scripts;
+		global $wp_widget_factory, $wp_scripts, $wp_styles;
 		$wp_scripts = null;
+		$wp_styles  = null;
 
 		add_theme_support( 'amp' );
 		AMP_Theme_Support::init();