Merge pull request #91 from dshanske/tests

Fix All But One Tests

Author: pfefferle

includes/class-linkbacks-mf2-handler.php

@@ -168,7 +168,7 @@ public static function generate_commentdata( $commentdata ) {
 					if ( ! is_wp_error( $response ) ) {
 						$parser = new Parser( wp_remote_retrieve_body( $response ), $author );
 						$author_array = $parser->parse( true );
-						$properties['author'] = $author = self::get_representative_author( $author_array, $author );
+						$properties['author'] = $author = self::flatten_microformats( self::get_representative_author( $author_array, $author ) );
 					}
 				} else {
 					$comment_data['comment_author'] = wp_slash( $author );
@@ -406,11 +406,10 @@ public static function get_representative_author( $mf_array, $source ) {
 					if ( isset( $mf['properties'] ) && isset( $mf['properties']['url'] ) ) {
 						foreach ( $mf['properties']['url'] as $url ) {
 							if ( wp_parse_url( $url, PHP_URL_HOST ) == wp_parse_url( $source, PHP_URL_HOST ) ) {
-								$flat = self::flatten_microformats( $mf );
 								if ( isset( $mf_array['rels']['me'] ) ) {
-									$flat['me'] = $mf_array['rels']['me'];
+									$mf['properties']['me'] = $mf_array['rels']['me'];
 								}
-								return $flat;
+								return $mf;
 								break;
 							}
 						}

tests/templates/adactio-com.html

@@ -476,7 +476,7 @@ <h2>More information</h2>
 <h3>About this site</h3>
 
 <address class="vcard h-card">
-<a href="http://adactio.com/" class="url u-url" rel="me">Adactio</a> is the online home of <a href="mailto:&#106;&#101;&#114;&#101;&#109;&#121;&#64;&#97;&#100;&#97;&#99;&#116;&#105;&#111;&#46;&#99;&#111;&#109;" class="email fn p-name u-email">Jeremy Keith</a>, a <span class="role p-role">web developer</span> and <span class="title p-job-title">author</span> living and working in <span class="adr p-adr"><span class="locality p-locality">Brighton</span>, <span class="country-name p-country-name">England</span></span>.
+<a href="http://example.com/adactio" class="url u-url" rel="me">Adactio</a> is the online home of <a href="mailto:&#106;&#101;&#114;&#101;&#109;&#121;&#64;&#97;&#100;&#97;&#99;&#116;&#105;&#111;&#46;&#99;&#111;&#109;" class="email fn p-name u-email">Jeremy Keith</a>, a <span class="role p-role">web developer</span> and <span class="title p-job-title">author</span> living and working in <span class="adr p-adr"><span class="locality p-locality">Brighton</span>, <span class="country-name p-country-name">England</span></span>.
 </address>
 </div>
 

tests/test-microformats.php

@@ -7,7 +7,7 @@ public function test_interpreter( $file_name ) {
 		$comment = Linkbacks_MF2_Handler::generate_commentdata(
 			array(
 				'remote_source_original' => file_get_contents( dirname( __FILE__ ) . '/templates/' . $file_name . '.html' ),
-				'comment_author_url' => 'http://example.com/webmention/source/placeholder',
+				'comment_author_url' => 'http://example.com/webmention/target/placeholder',
 				'target' => 'http://example.com/webmention/target/placeholder',
 				'comment_type' => 'webmention',
 				'comment_author' => $file_name,