Fix tests after on changes to Schema.org metadata inclusion

westonruter · westonruter · commit ccb5edaa6b27 · 2021-05-13T23:46:35.000-07:00
diff --git a/tests/php/test-class-amp-schema-org-metadata.php b/tests/php/test-class-amp-schema-org-metadata.php
@@ -55,10 +55,21 @@ public function get_schema_script_data() {
 	 * @param int    $expected Expected count of valid JSON+LD schema.
 	 */
 	public function test_transform( $json, $expected ) {
-		$html        = '<html><head><script type="application/ld+json">%s</script></head><body>Test</body></html>';
-		$dom         = Document::fromHtml( sprintf( $html, $json ), Options::DEFAULTS );
-		$transformer = new AmpSchemaOrgMetadata( new AmpSchemaOrgMetadataConfiguration() );
-		$errors      = new ErrorCollection();
+		$html          = '<html><head><script type="application/ld+json">%s</script></head><body>Test</body></html>';
+		$dom           = Document::fromHtml( sprintf( $html, $json ), Options::DEFAULTS );
+		$configuration = new AmpSchemaOrgMetadataConfiguration(
+			[
+				AmpSchemaOrgMetadataConfiguration::METADATA => [
+					'@context'  => 'http://schema.org',
+					'publisher' => [
+						'@type' => 'Organization',
+						'name'  => 'Acme',
+					],
+				],
+			]
+		);
+		$transformer   = new AmpSchemaOrgMetadata( $configuration );
+		$errors        = new ErrorCollection();
 		$transformer->transform( $dom, $errors );
 		$this->assertEquals( $expected, substr_count( $dom->saveHTML(), 'schema.org' ) );
 	}
@@ -69,8 +80,6 @@ public function test_transform( $json, $expected ) {
 	 * @covers ::transform
 	 */
 	public function test_empty_metadata_configuration() {
-		add_filter( 'amp_schemaorg_metadata', '__return_empty_array' );
-
 		$dom         = new Document();
 		$transformer = new AmpSchemaOrgMetadata( new AmpSchemaOrgMetadataConfiguration() );
 		$transformer->transform( $dom, new ErrorCollection() );
diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
@@ -1982,7 +1982,7 @@ public function test_prepare_response_throwing_exception() {
 		);
 
 		add_filter(
-			'amp_schemaorg_metadata',
+			'amp_enable_optimizer',
 			static function () {
 				throw new RuntimeException( 'FAILURE', 42 );
 			}

Original file line number	Diff line number	Diff line change
`@@ -1982,7 +1982,7 @@ public function test_prepare_response_throwing_exception() {`
`1982`	`1982`	`);`
`1983`	`1983`
`1984`	`1984`	`add_filter(`
`1985`		`- 'amp_schemaorg_metadata',`
	`1985`	`+ 'amp_enable_optimizer',`
`1986`	`1986`	`static function () {`
`1987`	`1987`	`throw new RuntimeException( 'FAILURE', 42 );`
`1988`	`1988`	`}`