Update integration test plugins and theme

mlwilkerson · mlwilkerson · commit 1c2c0ab4fd4c · 2021-03-30T17:28:11.000-07:00
diff --git a/integrations/plugins/plugin-beta/plugin-beta.php b/integrations/plugins/plugin-beta/plugin-beta.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Plugin Beta
  * Plugin URI:        https://fontawesome.com/
- * Description:       Registered Client with preferences version: webfont, 5.1.0, v4shim: on. Prepends a block before each blog post that displays (1) "fab fa-font-awesome", (2) "fa fa-arrows", which is a v4 icon declaration that the v4 shim should translate to "fas fa-arrows-alt", and (3) "fas fa-angry", which was a new icon in v5.1.0.
+ * Description:       Registered Client with preferences version: webfont, 5.1.0, v4shim: on. Adds content to the page footer that displays (1) "fab fa-font-awesome", (2) "fa fa-arrows", which is a v4 icon declaration that the v4 shim should translate to "fas fa-arrows-alt", and (3) "fas fa-angry", which was a new icon in v5.1.0.
  * Version:           0.0.1
  * Author:            Font Awesome
  * Author URI:        https://fontawesome.com/
@@ -30,19 +30,13 @@ function() {
 	}
 );
 
-add_filter(
-	'the_content',
-	function( $content ) {
-		$pre_content = <<<EOT
-<div class="plugin-beta-pre-content" style="border: 1px solid grey;">
+add_action('wp_print_footer_scripts', function() use($pre_content) {
+?>
+<div class="plugin-beta-content" style="border: 1px solid grey;">
   <h2>Plugin Beta</h2>
   <p>Expected by plugin-beta: "fab fa-font-awesome": <i class="fab fa-font-awesome"></i></p>
   <p>Shim icon (using the v4 class name): "fa fa-arrows": <i class="fa fa-arrows"></i></p>
   <p>Icon introduced in 5.1.0: "fas fa-angry": <i class="fas fa-angry"></i></p>
 </div>
-EOT;
-		return $pre_content . $content;
-	},
-	10,
-	1
-);
+<?php
+});
diff --git a/integrations/plugins/plugin-delta/plugin-delta.php b/integrations/plugins/plugin-delta/plugin-delta.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Plugin Delta
  * Plugin URI:        https://fontawesome.com/
- * Description:       Unregistered Client: tries to enqueue its own v5.0.11 SVG/JS from use.fontawesome.com. For display, prepends a block before every blog post that displays an icon with classes "fas fa-cloud-download". This icon appeared in v5.0.11 and is only available in Pro. It adds the same output on the login page, and in the footer of admin pages.
+ * Description:       Unregistered Client: tries to enqueue its own v5.0.11 SVG/JS from use.fontawesome.com. For display, adds content to the page footer that displays an icon with classes "fas fa-cloud-download". This icon appeared in v5.0.11 and is only available in Pro. It adds the same output on the login page, and in the footer of admin pages.
  * Version:           0.0.1
  * Author:            Font Awesome
  * Author URI:        https://fontawesome.com/
@@ -30,24 +30,20 @@ function() {
 	);
 }
 
-  $pre_content = <<<EOT
-<div class="plugin-delta-pre-content" style="border: 1px solid grey;">
+  $extra_content = <<<EOT
+<div class="plugin-delta-content" style="border: 1px solid grey;">
   <h2>Plugin Delta</h2>
   <p>Expected by plugin-delta (introduced v5.0.11): "fas fa-cloud-download": <i class="fas fa-cloud-download"></i></p>
 </div>
 EOT;
 
-add_filter('the_content', function($content) use($pre_content) {
-  return $pre_content . $content;
-}, 10, 1);
-
-add_filter('login_message', function($content) use($pre_content) {
-	return $pre_content . $content;
+add_action('wp_print_footer_scripts', function() use($extra_content) {
+	echo $extra_content;
 });
 
-add_action('admin_footer', function() use($pre_content) {
+add_action('admin_footer', function() use($extra_content) {
 	?>
-	<style>.plugin-delta-pre-content{position:absolute; margin-left: 20rem;}</style>
+	<style>.plugin-delta-content{position:absolute; margin-left: 20rem;}</style>
 	<?php
-	echo $pre_content;
+	echo $extra_content;
 });
diff --git a/integrations/plugins/plugin-eta/plugin-eta.php b/integrations/plugins/plugin-eta/plugin-eta.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Plugin Eta
  * Plugin URI:        https://fontawesome.com/
- * Description:       Registered Client with preferences: technology: svg, pseudoElements: true. Prepends a block to each blog post that displays the "fa-bed" icon as a :before pseudo-element.
+ * Description:       Registered Client with preferences: technology: svg, pseudoElements: true. Adds content to the page footer that displays the "fa-bed" icon as a :before pseudo-element.
  * Version:           0.0.1
  * Author:            Font Awesome
  * Author URI:        https://fontawesome.com/
@@ -43,16 +43,14 @@ function() {
 	}
 );
 
-add_filter('the_content', function($content){
-	$classes = plugin_eta_fa_classes();
-  $pre_content = <<<EOT
-<div class="$classes" style="border: 1px solid grey;">
+add_action('wp_print_footer_scripts', function() use($pre_content) {
+?>
+<div class="<?php echo esc_html__(plugin_eta_fa_classes(), 'font-awesome'); ?>" style="border: 1px solid grey;">
   <h2>Plugin Eta</h2>
   <p>Expected by plugin-eta: "fas fa-bed" icon as :before pseudo-element. <span class="bed"><- bed?</span></p>
-</uiv>
-EOT;
-  return $pre_content . $content;
-}, 10, 1);
+</div>
+<?php
+});
 
 function plugin_eta_fa_classes(){
 	$fa = fa();
diff --git a/integrations/plugins/plugin-gamma/plugin-gamma.php b/integrations/plugins/plugin-gamma/plugin-gamma.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Plugin Gamma
  * Plugin URI:        https://fontawesome.com/
- * Description:       Unregistered Client: tries to enqueue its own v4.7.0 webfont version from cdn.jsdelivr.net. On the front end, it prepends a block before each blog post that displays an icon with "fa fa-bathtub", which is a version 4 specification that the v4shim should translate to "fas fa-bath". It adds the same output on the login page, and in the footer of admin pages. It also emits rogue output that might break our REST API responses, like a buggy plugin might do.
+ * Description:       Unregistered Client: tries to enqueue its own v4.7.0 webfont version from cdn.jsdelivr.net. On the front end, it adds content to the footer of the template that displays an icon with "fa fa-bathtub", which is a version 4 specification that the v4shim should translate to "fas fa-bath". It adds the same output on the login page, and in the footer of admin pages.
  * Version:           0.0.1
  * Author:            Font Awesome
  * Author URI:        https://fontawesome.com/
@@ -14,8 +14,6 @@
 define( 'GAMMA_PLUGIN_VERSION', '0.0.1' );
 define( 'GAMMA_PLUGIN_LOG_PREFIX', 'gamma-plugin' );
 
-print "This rogue output from " . GAMMA_PLUGIN_LOG_PREFIX . " should not break our handling of REST API responses from our controllers.";
-
 foreach( ['wp_enqueue_scripts', 'admin_enqueue_scripts', 'login_enqueue_scripts'] as $action ) {
 	add_action( $action, function () {
 		wp_enqueue_style(
@@ -30,8 +28,8 @@
 	}, 99 );
 }
 
-  $pre_content = <<<EOT
-<div class="plugin-gamma-pre-content" style="border: 1px solid grey;">
+  $extra_content = <<<EOT
+<div class="plugin-gamma-content" style="border: 1px solid grey;">
   <h2>Plugin Gamma</h2>
   <p>v4.7.0 icon name: "fa fa-bathtub": <i class="fa fa-bathtub"></i></p>
   <p class="group-icon"><code>:before</code> pseudo-element should match <code>fas fa-users</code>: <i class="fas fa-users"></i></p>
@@ -40,17 +38,13 @@
 </div>
 EOT;
 
-add_filter('the_content', function($content) use($pre_content){
-  return $pre_content . $content;
-});
-
-add_filter('login_message', function($content) use($pre_content) {
-	return $pre_content . $content;
+add_action('wp_print_footer_scripts', function() use($extra_content) {
+	echo $extra_content;
 });
 
-add_action('admin_footer', function() use($pre_content) {
+add_action('admin_footer', function() use($extra_content) {
 	?>
-	<style>.plugin-gamma-pre-content{position:absolute; margin-left: 20rem;}</style>
+	<style>.plugin-gamma-content{position:absolute; margin-left: 20rem;}</style>
 	<?php
-	echo $pre_content;
+	echo $extra_content;
 }, 10, 1);
diff --git a/integrations/plugins/plugin-kappa/plugin-kappa.php b/integrations/plugins/plugin-kappa/plugin-kappa.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Plugin Kappa
  * Plugin URI:        https://fontawesome.com/
- * Description:       Unregistered Client: tries to enqueue its own self-hosted v4.7.0 webfont version. It prepends a block before each blog post that displays an icon with "fa fa-bathtub", which is a version 4 specification that the v4shim should translate to "fas fa-bath". It also uses some pseudo-elements with a hardcoded version 4 font-family.
+ * Description:       Unregistered Client: tries to enqueue its own self-hosted v4.7.0 webfont version. It adds content to the template footer that displays an icon with "fa fa-bathtub", which is a version 4 specification that the v4shim should translate to "fas fa-bath". It also uses some pseudo-elements with a hardcoded version 4 font-family.
  * Version:           0.0.1
  * Author:            Font Awesome
  * Author URI:        https://fontawesome.com/
@@ -32,15 +32,14 @@ function() {
 	);
 }
 
-add_filter('the_content', function($content){
-  $pre_content = <<<EOT
-<div class="plugin-kappa-pre-content" style="border: 1px solid grey;">
+add_action('wp_print_footer_scripts', function() use($pre_content) {
+?>
+<div class="plugin-kappa-content" style="border: 1px solid grey;">
   <h2>Plugin Kappa</h2>
   <p>v4.7.0 icon name: "fa fa-bathtub": <i class="fa fa-bathtub"></i></p>
   <p class="group-icon"><code>:before</code> pseudo-element should match <code>fas fa-users</code>: <i class="fas fa-users"></i></p>
   <p class="facebook-icon"><code>:before</code> pseudo-element should match <code>fab fa-facebook</code>: <i class="fab fa-facebook"></i></p>
   <p class="hand-scissors-icon"><code>:before</code> pseudo-element should match <code>far fa-hand-scissors</code>: <i class="far fa-hand-scissors"></i></p>
 </div>
-EOT;
-  return $pre_content . $content;
-}, 10, 1);
+<?php
+});
diff --git a/integrations/plugins/plugin-lambda/plugin-lambda.php b/integrations/plugins/plugin-lambda/plugin-lambda.php
@@ -23,8 +23,8 @@
 	}, 99 );
 }
 
-  $pre_content = <<<EOT
-<div class="plugin-lambda-pre-content" style="border: 1px solid grey;">
+  $extra_content = <<<EOT
+<div class="plugin-lambda-content" style="border: 1px solid grey;">
   <h2>Plugin Lambda</h2>
   <p>v4.7.0 icon name: "fa fa-bathtub": <i class="fa fa-bathtub"></i></p>
   <p class="group-icon"><code>:before</code> pseudo-element should match <code>fas fa-users</code>: <i class="fas fa-users"></i></p>
@@ -33,17 +33,13 @@
 </div>
 EOT;
 
-add_filter('the_content', function($content) use($pre_content){
-  return $pre_content . $content;
+add_action('wp_print_footer_scripts', function() use($extra_content) {
+	echo $extra_content;
 });
 
-add_filter('login_message', function($content) use($pre_content) {
-	return $pre_content . $content;
-});
-
-add_action('admin_footer', function() use($pre_content) {
+add_action('admin_footer', function() use($extra_content) {
 	?>
-	<style>.plugin-lambda-pre-content{position:absolute; margin-left: 20rem;}</style>
+	<style>.plugin-lambda-content{position:absolute; margin-left: 20rem;}</style>
 	<?php
-	echo $pre_content;
+	echo $extra_content;
 }, 10, 1);
diff --git a/integrations/plugins/plugin-sigma/plugin-sigma.php b/integrations/plugins/plugin-sigma/plugin-sigma.php
@@ -60,17 +60,11 @@ function() {
 	}
 );
 
-add_filter(
-	'the_content',
-	function( $content ) {
-		$pre_content = <<<EOT
+add_action('wp_print_footer_scripts', function() use($pre_content) {
+?>
 <div class="plugin-sigma-pre-content" style="border: 1px solid grey;">
   <h2>Plugin Sigma</h2>
   <p>Expected by plugin-sigma: "fab fa-fort-awesome": <i class="fab fa-fort-awesome"></i></p>
 </div>
-EOT;
-		return $pre_content . $content;
-	},
-	10,
-	1
-);
+<?php
+});
diff --git a/integrations/plugins/plugin-zeta/plugin-zeta.php b/integrations/plugins/plugin-zeta/plugin-zeta.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Plugin Zeta
  * Plugin URI:        https://fontawesome.com/
- * Description:       Registered Client preferring technology: svg (but not pseudo-elements). Prepends a block before each blog post that displays a magic icon with a rotate-90 power transform.
+ * Description:       Registered Client preferring technology: svg (but not pseudo-elements). Adds content to the template footer that displays a magic icon with a rotate-90 power transform.
  * Version:           0.0.1
  * Author:            Font Awesome
  * Author URI:        https://fontawesome.com/
@@ -28,10 +28,8 @@ function() {
 	}
 );
 
-add_filter(
-	'the_content',
-	function( $content ) {
-		$pre_content = <<<EOT
+add_action('wp_print_footer_scripts', function() use($pre_content) {
+?>
 <div class="plugin-zeta-pre-content" style="border: 1px solid grey;">
   <h2>Plugin Zeta</h2>
   <p>Expected by plugin-zeta: magic icon with rotate-90 power transform:
@@ -40,9 +38,5 @@ function( $content ) {
     </span>
   </p>
 </div>
-EOT;
-		return $pre_content . $content;
-	},
-	10,
-	1
-);
+<?php
+});
diff --git a/integrations/themes/theme-alpha/style.css b/integrations/themes/theme-alpha/style.css
@@ -1,10 +1,10 @@
 /*
  Theme Name:   Theme Alpha
  Theme URI:    http://example.com/theme-alpha/
- Description:  Twenty Seventeen Child Theme
+ Description:  Twenty Nineteen Child Theme
  Author:       John Doe
  Author URI:   http://example.com
- Template:     twentyseventeen
+ Template:     twentynineteen
  Version:      0.0.1
  License:      GNU General Public License v2 or later
  License URI:  http://www.gnu.org/licenses/gpl-2.0.html
