Fixes #3498 Turn off "Delay JS" option when Safe Mode is activated

inc/Engine/Admin/Deactivation/DeactivationIntent.php

@@ -139,7 +139,6 @@ public function activate_safe_mode() {
 			'rocket_safe_mode_reset_options',
 			[
 				'embeds'                 => 0,
-				'defer_all_js'           => 0,
 				'async_css'              => 0,
 				'lazyload'               => 0,
 				'lazyload_iframes'       => 0,
@@ -148,6 +147,8 @@ public function activate_safe_mode() {
 				'minify_concatenate_css' => 0,
 				'minify_js'              => 0,
 				'minify_concatenate_js'  => 0,
+				'defer_all_js'           => 0,
+				'delay_js'               => 0,
 				'minify_google_fonts'    => 0,
 				'cdn'                    => 0,
 			]

inc/Engine/Optimization/DelayJS/Admin/Subscriber.php

@@ -41,7 +41,6 @@ public static function get_subscribed_events() {
 				[ 'option_update_3_7_6_1', 13, 2 ],
 			],
 			'wp_ajax_rocket_restore_delay_js_defaults'     => 'restore_defaults',
-			'rocket_safe_mode_reset_options'               => 'add_options',
 		];
 	}
 

tests/Fixtures/inc/Engine/Admin/Deactivation/DeactivationIntent/activateSafeMode.php

@@ -0,0 +1,21 @@
+<?php
+
+return [
+	'testShouldResetOptions' => [
+		'expected' => [
+			'embeds'                 => 0,
+			'async_css'              => 0,
+			'lazyload'               => 0,
+			'lazyload_iframes'       => 0,
+			'lazyload_youtube'       => 0,
+			'minify_css'             => 0,
+			'minify_concatenate_css' => 0,
+			'minify_js'              => 0,
+			'minify_concatenate_js'  => 0,
+			'defer_all_js'           => 0,
+			'delay_js'               => 0,
+			'minify_google_fonts'    => 0,
+			'cdn'                    => 0,
+		],
+	],
+];

tests/Integration/inc/Engine/Admin/Deactivation/DeactivationIntent/activateSafeMode.php

@@ -41,7 +41,10 @@ public function testShouldSendErrorWhenNoCapacity() {
 		$this->assertFalse( $response->success );
 	}
 
-	public function testShouldResetOptions() {
+	/**
+	 * @dataProvider configTestData
+	 */
+	public function testShouldResetOptions( $expected ) {
 		CapTrait::setAdminCap();
 
 		$this->_setRole( 'administrator' );
@@ -53,24 +56,9 @@ public function testShouldResetOptions() {
 		$this->assertObjectHasAttribute( 'success', $response );
 		$this->assertTrue( $response->success );
 
-		$expected_subset = [
-			'embeds'                 => 0,
-			'defer_all_js'           => 0,
-			'async_css'              => 0,
-			'lazyload'               => 0,
-			'lazyload_iframes'       => 0,
-			'lazyload_youtube'       => 0,
-			'minify_css'             => 0,
-			'minify_concatenate_css' => 0,
-			'minify_js'              => 0,
-			'minify_concatenate_js'  => 0,
-			'minify_google_fonts'    => 0,
-			'cdn'                    => 0,
-		];
-
 		$options = get_option( 'wp_rocket_settings' );
 
-		foreach ( $expected_subset as $key => $value ) {
+		foreach ( $expected as $key => $value ) {
 			$this->assertArrayHasKey( $key, $options );
 			$this->assertSame( $value, $options[$key] );
 		}

tests/Integration/inc/Engine/Optimization/DelayJS/Admin/Subscriber/addOptions.php

@@ -33,17 +33,4 @@ public function testShouldDoExpectedForFirstInstallOptions( $input, $expected )
 		$this->assertSame( $expected, $actual );
 
 	}
-
-	/**
-	 * @dataProvider configTestData
-	 */
-	public function testShouldDoExpectedForSafeModeResetOptions( $input, $expected ) {
-		$options  = isset( $input['options'] )  ? $input['options']  : [];
-
-		$actual = apply_filters( 'rocket_safe_mode_reset_options', $options );
-
-		$this->assertSame( $expected, $actual );
-
-	}
-
 }

tests/Unit/inc/Engine/Admin/Deactivation/DeactivationIntent/activateSafeMode.php

@@ -4,7 +4,7 @@
 
 use Mockery;
 use Brain\Monkey\Functions;
-use WPMedia\PHPUnit\Unit\TestCase;
+use WP_Rocket\Tests\Unit\TestCase;
 use WP_Rocket\Engine\Admin\Deactivation\DeactivationIntent;
 
 /**
@@ -34,33 +34,21 @@ public function testShouldDoNothingWhenNoCapacity() {
 		$this->deactivation->activate_safe_mode();
 	}
 
-	public function testShouldResetOptions() {
-		$options = [
-			'embeds'                 => 0,
-			'defer_all_js'           => 0,
-			'async_css'              => 0,
-			'lazyload'               => 0,
-			'lazyload_iframes'       => 0,
-			'lazyload_youtube'       => 0,
-			'minify_css'             => 0,
-			'minify_concatenate_css' => 0,
-			'minify_js'              => 0,
-			'minify_concatenate_js'  => 0,
-			'minify_google_fonts'    => 0,
-			'cdn'                    => 0,
-		];
-
+	/**
+	 * @dataProvider configTestData
+	 */
+	public function testShouldResetOptions( $expected ) {
 		Functions\when( 'current_user_can' )->justReturn( true );
 
 		$this->options->shouldReceive( 'set_values' )
 			->once()
-			->with( $options );
+			->with( $expected );
 		$this->options->shouldReceive( 'get_options' )
 			->once()
-			->andReturn( $options );
+			->andReturn( $expected );
 		$this->options_api->shouldReceive( 'set' )
 			->once()
-			->with( 'settings', $options );
+			->with( 'settings', $expected );
 
 		Functions\expect( 'wp_send_json_success' )->once();