fix: failing tests for WP <6.4

Add two new methods in base test case to check WordPress version and mark test skipped for specific versions.
timber · Jan 26, 2024 · 02d0882 · 02d0882
1 parent b6be656
commit 02d0882
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/tests/Timber_UnitTestCase.php b/tests/Timber_UnitTestCase.php
@@ -262,4 +262,16 @@ public function restore_themes()
         wp_clean_themes_cache();
         unset($GLOBALS['wp_themes']);
     }
+
+    public function isWordPressVersion(string $version, string $operator = '=')
+    {
+        return version_compare($GLOBALS['wp_version'], $version, $operator);
+    }
+
+    public function skipForWordpressVersion(string $version, string $operator = '<')
+    {
+        if ($this->isWordPressVersion($version, $operator)) {
+            $this->markTestSkipped("This test requires WordPress version $version or higher.");
+        }
+    }
 }
diff --git a/tests/test-timber-wp-functions.php b/tests/test-timber-wp-functions.php
@@ -12,11 +12,12 @@ public function testFunctionFire()
         $this->assertEquals('jared sez hi', $output);
     }
 
-    /**
-     * @expectedDeprecated the_block_template_skip_link
-     */
     public function testFooterOnFooterFW()
     {
+        if ($this->isWordPressVersion('6.4', '>=')) {
+            $this->expectDeprecated();
+        }
+
         global $wp_scripts;
         $wp_scripts = null;
         wp_enqueue_script('jquery', false, [], false, true);
@@ -30,11 +31,11 @@ public function testFooterOnFooterFW()
         $this->assertSame(0, strlen($wp_footer_output1));
     }
 
-    /**
-     * @expectedDeprecated the_block_template_skip_link
-     */
     public function testFooterAlone()
     {
+        if ($this->isWordPressVersion('6.4', '>=')) {
+            $this->expectDeprecated();
+        }
         global $wp_scripts;
         $wp_scripts = null;
         wp_enqueue_script('jquery', false, [], false, true);
@@ -53,11 +54,11 @@ public function testDoubleAction()
         $this->assertEquals('bar', $fw1->call());
     }
 
-    /**
-     * @expectedDeprecated the_block_template_skip_link
-     */
     public function testDoubleActionWPFooter()
     {
+        if ($this->isWordPressVersion('6.4', '>=')) {
+            $this->expectDeprecated();
+        }
         global $wp_scripts;
         $wp_scripts = null;
         add_action('wp_footer', 'echo_junk');
@@ -69,11 +70,11 @@ public function testDoubleActionWPFooter()
         remove_action('wp_footer', 'echo_junk');
     }
 
-    /**
-     * @expectedDeprecated the_block_template_skip_link
-     */
     public function testInTwig()
     {
+        if ($this->isWordPressVersion('6.4', '>=')) {
+            $this->expectDeprecated();
+        }
         global $wp_scripts;
         $wp_scripts = null;
         wp_enqueue_script('jquery', false, [], false, true);
@@ -82,11 +83,11 @@ public function testInTwig()
         $this->assertGreaterThan(-1, $pos);
     }
 
-    /**
-     * @expectedDeprecated the_block_template_skip_link
-     */
     public function testInTwigString()
     {
+        if ($this->isWordPressVersion('6.4', '>=')) {
+            $this->expectDeprecated();
+        }
         global $wp_scripts;
         $wp_scripts = null;
         wp_enqueue_script('jquery', false, [], false, true);
@@ -95,11 +96,11 @@ public function testInTwigString()
         $this->assertGreaterThan(-1, $pos);
     }
 
-    /**
-     * @expectedDeprecated the_block_template_skip_link
-     */
     public function testAgainstFooterFunctionOutput()
     {
+        if ($this->isWordPressVersion('6.4', '>=')) {
+            $this->expectDeprecated();
+        }
         global $wp_scripts;
         $wp_scripts = null;
         wp_enqueue_script('colorpicker', false, [], false, true);