Fixed failing test on wp version < 6.1.0

tests/Integration/inc/functions/admin/rocketDeprecateAction.php

@@ -2,6 +2,7 @@
 
 namespace WP_Rocket\Tests\Integration\inc\functions;
 
+use WP_Rocket\Tests\Integration\IsolateHookTrait;
 use WP_Rocket\Tests\Integration\TestCase;
 
 /**
@@ -10,12 +11,19 @@
  */
 class Test_RocketDeprecateAction extends TestCase {
 
+    use IsolateHookTrait;
+
     public function set_up() {
-        add_filter( 'deprecated_hook_trigger_error', [ $this, 'return_false' ] );
+        parent::set_up();
+
+        add_action( 'deprecated_hook_run', [ $this, 'hook_callback' ] );
+        $this->unregisterAllCallbacksExcept('deprecated_hook_run', 'hook_callback');
 	}
 
     public function tear_down() {
-		remove_filter( 'deprecated_hook_trigger_error', [ $this, 'return_true' ] );
+        $this->restoreWpHook('deprecated_hook_run');
+
+        parent::tear_down();
 	}
 
 	/**

tests/Integration/inc/functions/admin/rocketDeprecateFilter.php

@@ -2,6 +2,7 @@
 
 namespace WP_Rocket\Tests\Integration\inc\functions;
 
+use WP_Rocket\Tests\Integration\IsolateHookTrait;
 use WP_Rocket\Tests\Integration\TestCase;
 
 /**
@@ -10,34 +11,47 @@
  */
 class Test_RocketDeprecateFilter extends TestCase {
 
+    use IsolateHookTrait;
+
     public function set_up() {
-        add_filter( 'deprecated_hook_trigger_error', [ $this, 'return_false' ] );
+        parent::set_up();
+
+        add_action( 'deprecated_hook_run', [ $this, 'action_hook_callback' ] );
+        $this->unregisterAllCallbacksExcept('deprecated_hook_run', 'action_hook_callback');
 	}
 
     public function tear_down() {
-		remove_filter( 'deprecated_hook_trigger_error', [ $this, 'return_true' ] );
+        $this->restoreWpHook('deprecated_hook_run');
+
+        parent::tear_down();
 	}
 
 	/**
 	 * @dataProvider providerTestData
 	 */
 	public function testShouldReturnExpected( $config, $expected ) {
 
-        add_filter( $config['old_hook'], [$this, 'hook_callback']);
+        global $wp_filters;
+
+        add_filter( $config['old_hook'], [$this, 'filter_hook_callback']);
 
         rocket_deprecate_filter( $config['new_hook'], $config['args'], $config['version'], $config['old_hook'] );
 
-		$this->assertSame( $expected, did_filter( $config['new_hook'] ) );
-		$this->assertSame( $expected, did_filter( $config['old_hook'] ) );
+		$this->assertSame( $expected, $wp_filters[ $config['new_hook'] ] );
+		$this->assertSame( $expected,  $wp_filters[ $config['old_hook'] ] );
 
-        remove_filter( $config['old_hook'], [$this, 'hook_callback']);
+        remove_filter( $config['old_hook'], [$this, 'filter_hook_callback']);
 	}
 
 	public function providerTestData() {
 		return $this->getTestData( __DIR__, basename( __FILE__, '.php' ) );
 	}
 
-    public function hook_callback() {
+    public function action_hook_callback() {
+        return;
+    }
+
+    public function filter_hook_callback() {
         return true;
     }