From 67e794ad109c81e610c792a27e4b9bc6c34f5851 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 3 Jun 2019 12:57:10 +0200
Subject: [PATCH 1/4] Print amp analytics in single story template

---
 includes/templates/single-amp_story.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/templates/single-amp_story.php b/includes/templates/single-amp_story.php
index 8c508d51288..248bfff2c29 100644
--- a/includes/templates/single-amp_story.php
+++ b/includes/templates/single-amp_story.php
@@ -68,6 +68,8 @@
 		<?php
 		// Note that \AMP_Story_Post_Type::filter_frontend_print_styles_array() will limit which styles are printed.
 		print_late_styles();
+
+		amp_print_analytics( '' );
 		?>
 	</body>
 </html>

From 1aa924d35d0436763a4e41f4f8100470a3be3fc4 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 3 Jun 2019 13:10:57 +0200
Subject: [PATCH 2/4] Add new amp_print_story_auto_ads function

---
 includes/amp-helper-functions.php        | 31 +++++++++++++++++++++
 includes/templates/single-amp_story.php  |  5 +++-
 tests/test-class-amp-story-post-type.php | 35 ++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 6cff8366e78..6c2b8e595d7 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -1130,3 +1130,34 @@ function amp_add_admin_bar_view_link( $wp_admin_bar ) {
 
 	$wp_admin_bar->add_menu( $parent );
 }
+
+/**
+ * Prints AMP Stories auto ads.
+ *
+ * @since 1.2
+ */
+function amp_print_story_auto_ads() {
+	/**
+	 * Filters the configuration data for <amp-story-auto-ads>
+	 *
+	 * This allows Dynamically inserting ads into a story.
+	 *
+	 * @param array   $data Story ads configuration data.
+	 * @param WP_Post $post The current story's post object.
+	 */
+	$data = apply_filters( 'amp_stories_auto_ads_configuration', array(), get_post() );
+
+	if ( empty( $data ) ) {
+		return;
+	}
+
+	$script_element = AMP_HTML_Utils::build_tag(
+		'script',
+		array(
+			'type' => 'application/json',
+		),
+		wp_json_encode( $data )
+	);
+
+	echo AMP_HTML_Utils::build_tag( 'amp-story-auto-ads', array(), $script_element ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+}
diff --git a/includes/templates/single-amp_story.php b/includes/templates/single-amp_story.php
index 248bfff2c29..c58cbdcbf2d 100644
--- a/includes/templates/single-amp_story.php
+++ b/includes/templates/single-amp_story.php
@@ -62,7 +62,10 @@
 				poster-landscape-src="<?php echo esc_url( $poster_landscape ); ?>"
 			<?php endif; ?>
 		>
-			<?php the_content(); ?>
+			<?php
+			amp_print_story_auto_ads();
+			the_content();
+			?>
 		</amp-story>
 
 		<?php
diff --git a/tests/test-class-amp-story-post-type.php b/tests/test-class-amp-story-post-type.php
index e759d98998c..0dc712ba618 100644
--- a/tests/test-class-amp-story-post-type.php
+++ b/tests/test-class-amp-story-post-type.php
@@ -373,4 +373,39 @@ public function create_story_posts_with_featured_images( $featured_images ) {
 
 		return $stories;
 	}
+
+	/**
+	 * Test amp_print_story_auto_ads()
+	 *
+	 * @covers ::amp_print_story_auto_ads()
+	 */
+	public function test_amp_print_story_auto_ads_empty() {
+		$actual = get_echo( 'amp_print_story_auto_ads' );
+
+		$this->assertEmpty( $actual );
+	}
+
+	/**
+	 * Test amp_print_story_auto_ads()
+	 *
+	 * @covers ::amp_print_story_auto_ads()
+	 */
+	public function test_amp_print_story_auto_ads() {
+		add_filter(
+			'amp_stories_auto_ads_configuration',
+			static function() {
+				return array(
+					'ad-attributes' => array(
+						'type'      => 'doubleclick',
+						'data-slot' => '/30497360/a4a/amp_story_dfp_example'
+					)
+				);
+			}
+		);
+
+		$actual = get_echo( 'amp_print_story_auto_ads' );
+
+		$this->assertStringStartsWith( '<amp-story-auto-ads', $actual );
+		$this->assertContains( '<script type="application/json">{"ad-attributes":{"type":"doubleclick"', $actual );
+	}
 }

From 7640bd315d68318625feb026aedbeca1b0717d19 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 3 Jun 2019 16:05:26 +0200
Subject: [PATCH 3/4] CS: Add missing trailing comma in test

---
 tests/test-class-amp-story-post-type.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-class-amp-story-post-type.php b/tests/test-class-amp-story-post-type.php
index 0dc712ba618..c159e4cacee 100644
--- a/tests/test-class-amp-story-post-type.php
+++ b/tests/test-class-amp-story-post-type.php
@@ -397,8 +397,8 @@ static function() {
 				return array(
 					'ad-attributes' => array(
 						'type'      => 'doubleclick',
-						'data-slot' => '/30497360/a4a/amp_story_dfp_example'
-					)
+						'data-slot' => '/30497360/a4a/amp_story_dfp_example',
+					),
 				);
 			}
 		);

From 59edcc346d576ba5dc0da6714e0d53e727dcff88 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 3 Jun 2019 16:51:03 +0200
Subject: [PATCH 4/4] Use singular noun for filter name

---
 includes/amp-helper-functions.php        | 4 ++--
 tests/test-class-amp-story-post-type.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 6c2b8e595d7..ef6909b64d6 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -1138,14 +1138,14 @@ function amp_add_admin_bar_view_link( $wp_admin_bar ) {
  */
 function amp_print_story_auto_ads() {
 	/**
-	 * Filters the configuration data for <amp-story-auto-ads>
+	 * Filters the configuration data for <amp-story-auto-ads>.
 	 *
 	 * This allows Dynamically inserting ads into a story.
 	 *
 	 * @param array   $data Story ads configuration data.
 	 * @param WP_Post $post The current story's post object.
 	 */
-	$data = apply_filters( 'amp_stories_auto_ads_configuration', array(), get_post() );
+	$data = apply_filters( 'amp_story_auto_ads_configuration', array(), get_post() );
 
 	if ( empty( $data ) ) {
 		return;
diff --git a/tests/test-class-amp-story-post-type.php b/tests/test-class-amp-story-post-type.php
index c159e4cacee..27355c05e37 100644
--- a/tests/test-class-amp-story-post-type.php
+++ b/tests/test-class-amp-story-post-type.php
@@ -392,7 +392,7 @@ public function test_amp_print_story_auto_ads_empty() {
 	 */
 	public function test_amp_print_story_auto_ads() {
 		add_filter(
-			'amp_stories_auto_ads_configuration',
+			'amp_story_auto_ads_configuration',
 			static function() {
 				return array(
 					'ad-attributes' => array(