From 412e977f4773d8d116e37fa41150ef4fa7479066 Mon Sep 17 00:00:00 2001
From: Miina Sikk <miina.sikk@gmail.com>
Date: Thu, 15 Mar 2018 21:08:30 +0200
Subject: [PATCH 1/5] Add handler for Gutenberg Categories block.

---
 includes/amp-helper-functions.php             | 33 +++----
 includes/class-amp-autoloader.php             |  1 +
 ...class-amp-gutenberg-categories-handler.php | 95 +++++++++++++++++++
 3 files changed, 113 insertions(+), 16 deletions(-)
 create mode 100644 includes/embeds/class-amp-gutenberg-categories-handler.php

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 175bf72ff3a..07eb7fbc37c 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -424,22 +424,23 @@ function amp_get_content_embed_handlers( $post = null ) {
 	 */
 	return apply_filters( 'amp_content_embed_handlers',
 		array(
-			'AMP_Twitter_Embed_Handler'     => array(),
-			'AMP_YouTube_Embed_Handler'     => array(),
-			'AMP_DailyMotion_Embed_Handler' => array(),
-			'AMP_Vimeo_Embed_Handler'       => array(),
-			'AMP_SoundCloud_Embed_Handler'  => array(),
-			'AMP_Instagram_Embed_Handler'   => array(),
-			'AMP_Issuu_Embed_Handler'       => array(),
-			'AMP_Meetup_Embed_Handler'      => array(),
-			'AMP_Vine_Embed_Handler'        => array(),
-			'AMP_Facebook_Embed_Handler'    => array(),
-			'AMP_Pinterest_Embed_Handler'   => array(),
-			'AMP_Playlist_Embed_Handler'    => array(),
-			'AMP_Reddit_Embed_Handler'      => array(),
-			'AMP_Tumblr_Embed_Handler'      => array(),
-			'AMP_Gallery_Embed_Handler'     => array(),
-			'WPCOM_AMP_Polldaddy_Embed'     => array(),
+			'AMP_Gutenberg_Categories_Handler' => array(),
+			'AMP_Twitter_Embed_Handler'        => array(),
+			'AMP_YouTube_Embed_Handler'        => array(),
+			'AMP_DailyMotion_Embed_Handler'    => array(),
+			'AMP_Vimeo_Embed_Handler'          => array(),
+			'AMP_SoundCloud_Embed_Handler'     => array(),
+			'AMP_Instagram_Embed_Handler'      => array(),
+			'AMP_Issuu_Embed_Handler'          => array(),
+			'AMP_Meetup_Embed_Handler'         => array(),
+			'AMP_Vine_Embed_Handler'           => array(),
+			'AMP_Facebook_Embed_Handler'       => array(),
+			'AMP_Pinterest_Embed_Handler'      => array(),
+			'AMP_Playlist_Embed_Handler'       => array(),
+			'AMP_Reddit_Embed_Handler'         => array(),
+			'AMP_Tumblr_Embed_Handler'         => array(),
+			'AMP_Gallery_Embed_Handler'        => array(),
+			'WPCOM_AMP_Polldaddy_Embed'        => array(),
 		),
 		$post
 	);
diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index 3ec923b7bde..f7c68c9f673 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -38,6 +38,7 @@ class AMP_Autoloader {
 		'AMP_DailyMotion_Embed_Handler'               => 'includes/embeds/class-amp-dailymotion-embed',
 		'AMP_Facebook_Embed_Handler'                  => 'includes/embeds/class-amp-facebook-embed',
 		'AMP_Gallery_Embed_Handler'                   => 'includes/embeds/class-amp-gallery-embed',
+		'AMP_Gutenberg_Categories_Handler'            => 'includes/embeds/class-amp-gutenberg-categories-handler',
 		'AMP_Instagram_Embed_Handler'                 => 'includes/embeds/class-amp-instagram-embed',
 		'AMP_Issuu_Embed_Handler'                     => 'includes/embeds/class-amp-issuu-embed-handler',
 		'AMP_Meetup_Embed_Handler'                    => 'includes/embeds/class-amp-meetup-embed-handler',
diff --git a/includes/embeds/class-amp-gutenberg-categories-handler.php b/includes/embeds/class-amp-gutenberg-categories-handler.php
new file mode 100644
index 00000000000..a49dcd21d87
--- /dev/null
+++ b/includes/embeds/class-amp-gutenberg-categories-handler.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Class AMP_Gutenberg_Categories_Handler
+ *
+ * @package AMP
+ */
+
+/**
+ * Class AMP_Gutenberg_Categories_Handler
+ *
+ * @since 1.0
+ */
+class AMP_Gutenberg_Categories_Handler extends AMP_Base_Embed_Handler {
+
+	/**
+	 * Register embed.
+	 */
+	public function register_embed() {
+		add_action( 'the_post', array( $this, 'override_category_block_render_callback' ) );
+	}
+
+	/**
+	 * Unregister embed.
+	 */
+	public function unregister_embed() {}
+
+	/**
+	 * Override the output of Gutenberg core/category block.
+	 */
+	public function override_category_block_render_callback() {
+		if ( is_amp_endpoint() ) {
+			$registry               = WP_Block_Type_Registry::get_instance();
+			$block                  = $registry->get_registered( 'core/categories' );
+			$block->render_callback = array( $this, 'render' );
+		}
+	}
+
+	/**
+	 * Render.
+	 *
+	 * @param array $attributes Attributes.
+	 * @return string Rendered.
+	 */
+	public function render( $attributes ) {
+		static $block_id = 0;
+		$block_id++;
+
+		$align = 'center';
+		if ( isset( $attributes['align'] ) && in_array( $attributes['align'], array( 'left', 'right', 'full' ), true ) ) {
+			$align = $attributes['align'];
+		}
+
+		$args = array(
+			'echo'         => false,
+			'hierarchical' => ! empty( $attributes['showHierarchy'] ),
+			'orderby'      => 'name',
+			'show_count'   => ! empty( $attributes['showPostCounts'] ),
+			'title_li'     => '',
+		);
+
+		if ( ! empty( $attributes['displayAsDropdown'] ) ) {
+			$id                       = 'wp-block-categories-dropdown-' . $block_id;
+			$form_id                  = $id . '-form';
+			$args['id']               = $id;
+			$args['show_option_none'] = __( 'Select Category', 'gutenberg' );
+			$wrapper_markup           = '<div class="%1$s">%2$s</div>';
+			$items_markup             = wp_dropdown_categories( $args );
+			$type                     = 'dropdown';
+
+			$items_markup = preg_replace(
+				'/(?<=<select\b)/',
+				sprintf( ' on="change:%s.submit"', esc_attr( $form_id ) ),
+				$items_markup,
+				1
+			);
+		} else {
+			$wrapper_markup = '<div class="%1$s"><ul>%2$s</ul></div>';
+			$items_markup   = wp_list_categories( $args );
+			$type           = 'list';
+		}
+
+		$class = "wp-block-categories wp-block-categories-{$type} align{$align}";
+
+		$block_content = sprintf(
+			$wrapper_markup,
+			esc_attr( $class ),
+			$items_markup
+		);
+
+		if ( ! empty( $attributes['displayAsDropdown'] ) ) {
+			$block_content = sprintf('<form action="%s" method="get" target="_top" id="%s">%s</form>', esc_url( home_url() ), esc_attr( $form_id ), $block_content );
+		}
+		return $block_content;
+	}
+}

From ba87e2014c13c1f144981dce605662c3e9d4089d Mon Sep 17 00:00:00 2001
From: Miina Sikk <miina.sikk@gmail.com>
Date: Thu, 15 Mar 2018 21:20:23 +0200
Subject: [PATCH 2/5] Add better method comment.

---
 includes/embeds/class-amp-gutenberg-categories-handler.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/embeds/class-amp-gutenberg-categories-handler.php b/includes/embeds/class-amp-gutenberg-categories-handler.php
index a49dcd21d87..7e9b67ce761 100644
--- a/includes/embeds/class-amp-gutenberg-categories-handler.php
+++ b/includes/embeds/class-amp-gutenberg-categories-handler.php
@@ -36,7 +36,8 @@ public function override_category_block_render_callback() {
 	}
 
 	/**
-	 * Render.
+	 * Render Gutenberg block. This is essentially the same method as the original.
+	 * Difference is excluding the disallowed JS script, adding <form> tags, and using on:change for <select>.
 	 *
 	 * @param array $attributes Attributes.
 	 * @return string Rendered.
@@ -62,7 +63,7 @@ public function render( $attributes ) {
 			$id                       = 'wp-block-categories-dropdown-' . $block_id;
 			$form_id                  = $id . '-form';
 			$args['id']               = $id;
-			$args['show_option_none'] = __( 'Select Category', 'gutenberg' );
+			$args['show_option_none'] = __( 'Select Category', 'amp' );
 			$wrapper_markup           = '<div class="%1$s">%2$s</div>';
 			$items_markup             = wp_dropdown_categories( $args );
 			$type                     = 'dropdown';
@@ -88,7 +89,7 @@ public function render( $attributes ) {
 		);
 
 		if ( ! empty( $attributes['displayAsDropdown'] ) ) {
-			$block_content = sprintf('<form action="%s" method="get" target="_top" id="%s">%s</form>', esc_url( home_url() ), esc_attr( $form_id ), $block_content );
+			$block_content = sprintf( '<form action="%s" method="get" target="_top" id="%s">%s</form>', esc_url( home_url() ), esc_attr( $form_id ), $block_content );
 		}
 		return $block_content;
 	}

From 0a85c06991642ff416563ab3762b5967f380b9a0 Mon Sep 17 00:00:00 2001
From: Miina Sikk <miina.sikk@gmail.com>
Date: Thu, 15 Mar 2018 23:56:09 +0200
Subject: [PATCH 3/5] Add test file.

---
 ...class-amp-gutenberg-categories-handler.php |  4 +-
 ...class-amp-gutenberg-categories-handler.php | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-class-amp-gutenberg-categories-handler.php

diff --git a/includes/embeds/class-amp-gutenberg-categories-handler.php b/includes/embeds/class-amp-gutenberg-categories-handler.php
index 7e9b67ce761..14e815864c5 100644
--- a/includes/embeds/class-amp-gutenberg-categories-handler.php
+++ b/includes/embeds/class-amp-gutenberg-categories-handler.php
@@ -16,7 +16,9 @@ class AMP_Gutenberg_Categories_Handler extends AMP_Base_Embed_Handler {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		add_action( 'the_post', array( $this, 'override_category_block_render_callback' ) );
+		if ( function_exists( 'gutenberg_init' ) ) {
+			add_action( 'the_post', array( $this, 'override_category_block_render_callback' ) );
+		}
 	}
 
 	/**
diff --git a/tests/test-class-amp-gutenberg-categories-handler.php b/tests/test-class-amp-gutenberg-categories-handler.php
new file mode 100644
index 00000000000..aee0d73aaf0
--- /dev/null
+++ b/tests/test-class-amp-gutenberg-categories-handler.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Tests for AMP_Gutenberg_Categories_Handler.
+ *
+ * @package AMP
+ * @since 1.0
+ */
+
+/**
+ * Tests for AMP_Gutenberg_Categories_Handler.
+ *
+ * @package AMP
+ * @covers AMP_Gutenberg_Categories_Handler
+ */
+class Test_AMP_Gutenberg_Categories_Handler extends WP_UnitTestCase {
+
+	/**
+	 * Instance of the tested class.
+	 *
+	 * @var AMP_Gutenberg_Categories_Handler.
+	 */
+	public $instance;
+
+	/**
+	 * Set up test.
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->instance = new AMP_Gutenberg_Categories_Handler();
+
+		// Require gutenberg file to be able to run the tests.
+		if ( file_exists( AMP__DIR__ . '/../gutenberg/gutenberg.php' ) ) {
+			require_once AMP__DIR__ . '/../gutenberg/gutenberg.php';
+		}
+	}
+
+	/**
+	 * Test register_embed.
+	 *
+	 * @covers AMP_Gutenberg_Categories_Handler::register_embed()
+	 */
+	public function test_register_embed() {
+		if ( function_exists( 'gutenberg_init' ) ) {
+			$this->instance->register_embed();
+			$this->assertEquals( 10, has_action( 'the_post', array( $this->instance, 'override_category_block_render_callback' ) ) );
+		}
+	}
+}

From 3d75fe3507c000fd83a70e29e730b6e8c2b16222 Mon Sep 17 00:00:00 2001
From: Miina Sikk <miina.sikk@gmail.com>
Date: Mon, 19 Mar 2018 20:17:05 +0200
Subject: [PATCH 4/5] Rename block handler class. Use unregister_embed. Fix
 tests.

---
 includes/amp-helper-functions.php             |  34 +++---
 includes/class-amp-autoloader.php             |   2 +-
 ...r.php => class-amp-core-block-handler.php} |  47 +++++---
 tests/test-class-amp-core-block-handler.php   | 109 ++++++++++++++++++
 ...class-amp-gutenberg-categories-handler.php |  48 --------
 5 files changed, 160 insertions(+), 80 deletions(-)
 rename includes/embeds/{class-amp-gutenberg-categories-handler.php => class-amp-core-block-handler.php} (67%)
 create mode 100644 tests/test-class-amp-core-block-handler.php
 delete mode 100644 tests/test-class-amp-gutenberg-categories-handler.php

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 07eb7fbc37c..7814388cdbc 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -424,23 +424,23 @@ function amp_get_content_embed_handlers( $post = null ) {
 	 */
 	return apply_filters( 'amp_content_embed_handlers',
 		array(
-			'AMP_Gutenberg_Categories_Handler' => array(),
-			'AMP_Twitter_Embed_Handler'        => array(),
-			'AMP_YouTube_Embed_Handler'        => array(),
-			'AMP_DailyMotion_Embed_Handler'    => array(),
-			'AMP_Vimeo_Embed_Handler'          => array(),
-			'AMP_SoundCloud_Embed_Handler'     => array(),
-			'AMP_Instagram_Embed_Handler'      => array(),
-			'AMP_Issuu_Embed_Handler'          => array(),
-			'AMP_Meetup_Embed_Handler'         => array(),
-			'AMP_Vine_Embed_Handler'           => array(),
-			'AMP_Facebook_Embed_Handler'       => array(),
-			'AMP_Pinterest_Embed_Handler'      => array(),
-			'AMP_Playlist_Embed_Handler'       => array(),
-			'AMP_Reddit_Embed_Handler'         => array(),
-			'AMP_Tumblr_Embed_Handler'         => array(),
-			'AMP_Gallery_Embed_Handler'        => array(),
-			'WPCOM_AMP_Polldaddy_Embed'        => array(),
+			'AMP_Core_Block_Handler'        => array(),
+			'AMP_Twitter_Embed_Handler'     => array(),
+			'AMP_YouTube_Embed_Handler'     => array(),
+			'AMP_DailyMotion_Embed_Handler' => array(),
+			'AMP_Vimeo_Embed_Handler'       => array(),
+			'AMP_SoundCloud_Embed_Handler'  => array(),
+			'AMP_Instagram_Embed_Handler'   => array(),
+			'AMP_Issuu_Embed_Handler'       => array(),
+			'AMP_Meetup_Embed_Handler'      => array(),
+			'AMP_Vine_Embed_Handler'        => array(),
+			'AMP_Facebook_Embed_Handler'    => array(),
+			'AMP_Pinterest_Embed_Handler'   => array(),
+			'AMP_Playlist_Embed_Handler'    => array(),
+			'AMP_Reddit_Embed_Handler'      => array(),
+			'AMP_Tumblr_Embed_Handler'      => array(),
+			'AMP_Gallery_Embed_Handler'     => array(),
+			'WPCOM_AMP_Polldaddy_Embed'     => array(),
 		),
 		$post
 	);
diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index f7c68c9f673..b98afe871be 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -38,7 +38,7 @@ class AMP_Autoloader {
 		'AMP_DailyMotion_Embed_Handler'               => 'includes/embeds/class-amp-dailymotion-embed',
 		'AMP_Facebook_Embed_Handler'                  => 'includes/embeds/class-amp-facebook-embed',
 		'AMP_Gallery_Embed_Handler'                   => 'includes/embeds/class-amp-gallery-embed',
-		'AMP_Gutenberg_Categories_Handler'            => 'includes/embeds/class-amp-gutenberg-categories-handler',
+		'AMP_Core_Block_Handler'                      => 'includes/embeds/class-amp-core-block-handler',
 		'AMP_Instagram_Embed_Handler'                 => 'includes/embeds/class-amp-instagram-embed',
 		'AMP_Issuu_Embed_Handler'                     => 'includes/embeds/class-amp-issuu-embed-handler',
 		'AMP_Meetup_Embed_Handler'                    => 'includes/embeds/class-amp-meetup-embed-handler',
diff --git a/includes/embeds/class-amp-gutenberg-categories-handler.php b/includes/embeds/class-amp-core-block-handler.php
similarity index 67%
rename from includes/embeds/class-amp-gutenberg-categories-handler.php
rename to includes/embeds/class-amp-core-block-handler.php
index 14e815864c5..430662ddf76 100644
--- a/includes/embeds/class-amp-gutenberg-categories-handler.php
+++ b/includes/embeds/class-amp-core-block-handler.php
@@ -1,39 +1,58 @@
 <?php
 /**
- * Class AMP_Gutenberg_Categories_Handler
+ * Class AMP_Core_Block_Handler
  *
  * @package AMP
  */
 
 /**
- * Class AMP_Gutenberg_Categories_Handler
+ * Class AMP_Core_Block_Handler
  *
  * @since 1.0
  */
-class AMP_Gutenberg_Categories_Handler extends AMP_Base_Embed_Handler {
+class AMP_Core_Block_Handler extends AMP_Base_Embed_Handler {
+
+	/**
+	 * Original block callback.
+	 *
+	 * @var array
+	 */
+	public $original_categories_callback;
+
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	public $block_name = 'core/categories';
 
 	/**
 	 * Register embed.
 	 */
 	public function register_embed() {
-		if ( function_exists( 'gutenberg_init' ) ) {
-			add_action( 'the_post', array( $this, 'override_category_block_render_callback' ) );
+		if ( class_exists( 'WP_Block_Type_Registry' ) ) {
+			$registry = WP_Block_Type_Registry::get_instance();
+			$block    = $registry->get_registered( $this->block_name );
+
+			if ( $block ) {
+				$this->original_categories_callback = $block->render_callback;
+				$block->render_callback             = array( $this, 'render' );
+			}
 		}
 	}
 
 	/**
 	 * Unregister embed.
 	 */
-	public function unregister_embed() {}
+	public function unregister_embed() {
+		if ( class_exists( 'WP_Block_Type_Registry' ) ) {
+			$registry = WP_Block_Type_Registry::get_instance();
+			$block    = $registry->get_registered( $this->block_name );
 
-	/**
-	 * Override the output of Gutenberg core/category block.
-	 */
-	public function override_category_block_render_callback() {
-		if ( is_amp_endpoint() ) {
-			$registry               = WP_Block_Type_Registry::get_instance();
-			$block                  = $registry->get_registered( 'core/categories' );
-			$block->render_callback = array( $this, 'render' );
+			if ( $block && ! empty( $this->original_categories_callback ) ) {
+				$block->render_callback             = $this->original_categories_callback;
+				$this->original_categories_callback = null;
+			}
 		}
 	}
 
diff --git a/tests/test-class-amp-core-block-handler.php b/tests/test-class-amp-core-block-handler.php
new file mode 100644
index 00000000000..edc3460384c
--- /dev/null
+++ b/tests/test-class-amp-core-block-handler.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Tests for AMP_Core_Block_Handler.
+ *
+ * @package AMP
+ * @since 1.0
+ */
+
+/**
+ * Tests for AMP_Core_Block_Handler.
+ *
+ * @package AMP
+ * @covers AMP_Core_Block_Handler
+ */
+class Test_AMP_Core_Block_Handler extends WP_UnitTestCase {
+
+	/**
+	 * Instance of the tested class.
+	 *
+	 * @var AMP_Core_Block_Handler.
+	 */
+	public $instance;
+
+	/**
+	 * Test block name.
+	 *
+	 * @var string
+	 */
+	public $test_block = 'core/test';
+
+	public function setUp() {
+		parent::setUp();
+
+		// Require gutenberg file to be able to run the tests.
+		if ( file_exists( AMP__DIR__ . '/../gutenberg/gutenberg.php' ) ) {
+			require_once AMP__DIR__ . '/../gutenberg/gutenberg.php';
+		}
+	}
+
+	/**
+	 * Teardown.
+	 */
+	public function tearDown() {
+		$this->unregister_dummy_block();
+		parent::tearDown();
+	}
+
+	/**
+	 * Register test block.
+	 */
+	public function register_dummy_block() {
+		$settings = array(
+			'render_callback' => '__return_true',
+		);
+		register_block_type( $this->test_block, $settings );
+	}
+
+	/**
+	 * Unregister test block.
+	 */
+	public function unregister_dummy_block() {
+		unregister_block_type( $this->test_block );
+	}
+
+	/**
+	 * Test register_embed().
+	 */
+	public function test_register_embed() {
+
+		$this->register_dummy_block();
+
+		$this->instance             = new AMP_Core_Block_Handler();
+		$this->instance->block_name = $this->test_block;
+
+		$registry = WP_Block_Type_Registry::get_instance();
+		$block    = $registry->get_registered( $this->test_block );
+
+		$this->assertEquals( '__return_true', $block->render_callback );
+
+		$this->instance->register_embed();
+
+		$registry = WP_Block_Type_Registry::get_instance();
+		$block    = $registry->get_registered( $this->test_block );
+
+		$this->assertTrue( is_array( $block->render_callback ) );
+
+		$this->unregister_dummy_block();
+	}
+
+	/**
+	 * Test unregister_embed().
+	 */
+	public function test_unregister_embed() {
+		$this->register_dummy_block();
+
+		$this->instance             = new AMP_Core_Block_Handler();
+		$this->instance->block_name = $this->test_block;
+
+		$this->instance->register_embed();
+		$this->instance->unregister_embed();
+
+		$registry = WP_Block_Type_Registry::get_instance();
+		$block    = $registry->get_registered( $this->test_block );
+
+		$this->assertEquals(  '__return_true', $block->render_callback );
+
+		$this->unregister_dummy_block();
+	}
+}
diff --git a/tests/test-class-amp-gutenberg-categories-handler.php b/tests/test-class-amp-gutenberg-categories-handler.php
deleted file mode 100644
index aee0d73aaf0..00000000000
--- a/tests/test-class-amp-gutenberg-categories-handler.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Tests for AMP_Gutenberg_Categories_Handler.
- *
- * @package AMP
- * @since 1.0
- */
-
-/**
- * Tests for AMP_Gutenberg_Categories_Handler.
- *
- * @package AMP
- * @covers AMP_Gutenberg_Categories_Handler
- */
-class Test_AMP_Gutenberg_Categories_Handler extends WP_UnitTestCase {
-
-	/**
-	 * Instance of the tested class.
-	 *
-	 * @var AMP_Gutenberg_Categories_Handler.
-	 */
-	public $instance;
-
-	/**
-	 * Set up test.
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->instance = new AMP_Gutenberg_Categories_Handler();
-
-		// Require gutenberg file to be able to run the tests.
-		if ( file_exists( AMP__DIR__ . '/../gutenberg/gutenberg.php' ) ) {
-			require_once AMP__DIR__ . '/../gutenberg/gutenberg.php';
-		}
-	}
-
-	/**
-	 * Test register_embed.
-	 *
-	 * @covers AMP_Gutenberg_Categories_Handler::register_embed()
-	 */
-	public function test_register_embed() {
-		if ( function_exists( 'gutenberg_init' ) ) {
-			$this->instance->register_embed();
-			$this->assertEquals( 10, has_action( 'the_post', array( $this->instance, 'override_category_block_render_callback' ) ) );
-		}
-	}
-}

From 93f77fc8f04f42e7fdb2f7ad5fd746301286724b Mon Sep 17 00:00:00 2001
From: Miina Sikk <miina.sikk@gmail.com>
Date: Mon, 19 Mar 2018 20:30:20 +0200
Subject: [PATCH 5/5] Try fixing tests.

---
 tests/test-class-amp-core-block-handler.php | 24 +++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/tests/test-class-amp-core-block-handler.php b/tests/test-class-amp-core-block-handler.php
index edc3460384c..c0bb8d7560a 100644
--- a/tests/test-class-amp-core-block-handler.php
+++ b/tests/test-class-amp-core-block-handler.php
@@ -28,12 +28,21 @@ class Test_AMP_Core_Block_Handler extends WP_UnitTestCase {
 	 */
 	public $test_block = 'core/test';
 
+	/**
+	 * Setup.
+	 */
 	public function setUp() {
 		parent::setUp();
 
 		// Require gutenberg file to be able to run the tests.
 		if ( file_exists( AMP__DIR__ . '/../gutenberg/gutenberg.php' ) ) {
 			require_once AMP__DIR__ . '/../gutenberg/gutenberg.php';
+
+			if ( ! function_exists( 'register_block_type' ) ) {
+				require_once AMP__DIR__ . '/../gutenberg/lib/class-wp-block-type.php';
+				require_once AMP__DIR__ . '/../gutenberg/lib/class-wp-block-type-registry.php';
+				require_once AMP__DIR__ . '/../gutenberg/lib/blocks.php';
+			}
 		}
 	}
 
@@ -41,7 +50,10 @@ public function setUp() {
 	 * Teardown.
 	 */
 	public function tearDown() {
-		$this->unregister_dummy_block();
+		if ( function_exists( 'register_block_type' ) ) {
+			$this->unregister_dummy_block();
+		}
+
 		parent::tearDown();
 	}
 
@@ -67,6 +79,10 @@ public function unregister_dummy_block() {
 	 */
 	public function test_register_embed() {
 
+		if ( ! function_exists( 'register_block_type' ) ) {
+			$this->markTestIncomplete( 'Files needed for testing missing.' );
+		}
+
 		$this->register_dummy_block();
 
 		$this->instance             = new AMP_Core_Block_Handler();
@@ -91,6 +107,10 @@ public function test_register_embed() {
 	 * Test unregister_embed().
 	 */
 	public function test_unregister_embed() {
+		if ( ! function_exists( 'register_block_type' ) ) {
+			$this->markTestIncomplete( 'Files needed for testing missing.' );
+		}
+
 		$this->register_dummy_block();
 
 		$this->instance             = new AMP_Core_Block_Handler();
@@ -102,7 +122,7 @@ public function test_unregister_embed() {
 		$registry = WP_Block_Type_Registry::get_instance();
 		$block    = $registry->get_registered( $this->test_block );
 
-		$this->assertEquals(  '__return_true', $block->render_callback );
+		$this->assertEquals( '__return_true', $block->render_callback );
 
 		$this->unregister_dummy_block();
 	}