1.x Fix tests failing with WordPress 6.4 (#2964)

timber · Apr 10, 2024 · 72d68f8 · 72d68f8
1 parent 4e90b28
commit 72d68f8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/tests/Timber_UnitTestCase.php b/tests/Timber_UnitTestCase.php
@@ -219,4 +219,16 @@ protected function callMethod($obj, $name, array $args = [])
         $method->setAccessible(true);
         return $method->invokeArgs($obj, $args);
     }
+
+	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,6 +12,10 @@ function testFunctionFire(){
 		}
 
 		function testFooterOnFooterFW(){
+			if ($this->isWordPressVersion('6.4', '>=')) {
+				$this->setExpectedDeprecated('the_block_template_skip_link');
+			}
+
 			global $wp_scripts;
 			$wp_scripts = null;
 			wp_enqueue_script( 'jquery', false, array(), false, true );
@@ -26,6 +30,10 @@ function testFooterOnFooterFW(){
 		}
 
 		function testFooterAlone(){
+			if ($this->isWordPressVersion('6.4', '>=')) {
+				$this->setExpectedDeprecated('the_block_template_skip_link');
+			}
+
 			global $wp_scripts;
 			$wp_scripts = null;
 			wp_enqueue_script( 'jquery', false, array(), false, true );
@@ -44,6 +52,10 @@ function testDoubleAction(){
 		}
 
 		function testDoubleActionWPFooter(){
+			if ($this->isWordPressVersion('6.4', '>=')) {
+				$this->setExpectedDeprecated('the_block_template_skip_link');
+			}
+
 			global $wp_scripts;
 			$wp_scripts = null;
 			add_action('wp_footer', 'echo_junk');
@@ -55,6 +67,10 @@ function testDoubleActionWPFooter(){
 		}
 
 		function testInTwig(){
+			if ($this->isWordPressVersion('6.4', '>=')) {
+				$this->setExpectedDeprecated('the_block_template_skip_link');
+			}
+
 			global $wp_scripts;
 			$wp_scripts = null;
 			wp_enqueue_script( 'jquery', false, array(), false, true );
@@ -63,6 +79,10 @@ function testInTwig(){
 		}
 
 		function testInTwigString(){
+			if ($this->isWordPressVersion('6.4', '>=')) {
+				$this->setExpectedDeprecated('the_block_template_skip_link');
+			}
+
 			global $wp_scripts;
 			$wp_scripts = null;
 			wp_enqueue_script( 'jquery', false, array(), false, true );
@@ -71,6 +91,10 @@ function testInTwigString(){
 		}
 
 		function testAgainstFooterFunctionOutput(){
+			if ($this->isWordPressVersion('6.4', '>=')) {
+				$this->setExpectedDeprecated('the_block_template_skip_link');
+			}
+
 			global $wp_scripts;
 			$wp_scripts = null;
 			wp_enqueue_script( 'colorpicker', false, array(), false, true);