Merge branch 'develop' into fix/integration-tests-cleanup

wp-media · May 9, 2024 · 66346fc · 66346fc
2 parents 0685e57 + 770c397
commit 66346fc
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 168 deletions.
diff --git a/tests/Fixtures/inc/Engine/License/API/User/isLicenseExpiredGracePeriod.php b/tests/Fixtures/inc/Engine/License/API/User/isLicenseExpiredGracePeriod.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+	'testShouldReturnTrueWhenNotObject' => [
+		'data'     => [],
+		'expected' => true,
+	],
+	'testShouldReturnTrueWhenPropertyNotSet' => [
+		'data'     => json_decode( json_encode( [
+			'ID' => 1,
+		] ) ),
+		'expected' => true,
+	],
+	'testShouldReturnFalseWhenNotExpired' => [
+		'data'     => json_decode( json_encode( [
+			'ID'                 => 1,
+			'licence_expiration' => strtotime( 'next week' ),
+		] ) ),
+		'expected' => false,
+	],
+	'testShouldReturnTrueWhenExpired' => [
+		'data'     => json_decode( json_encode( [
+			'ID'                 => 1,
+			'licence_expiration' => strtotime( '3 weeks ago' ),
+		] ) ),
+		'expected' => true,
+	],
+];
diff --git a/tests/Integration/inc/Engine/Preload/Subscriber/excludePrivatePostUri.php b/tests/Integration/inc/Engine/Preload/Subscriber/excludePrivatePostUri.php
diff --git a/tests/Unit/inc/Engine/Common/JobManager/Strategy/Context/RetryContext/setStrategy.php b/tests/Unit/inc/Engine/Common/JobManager/Strategy/Context/RetryContext/setStrategy.php
diff --git a/.../API/User/IsLicenseExpiredGracePeriod.php → .../API/User/isLicenseExpiredGracePeriod.php b/.../API/User/IsLicenseExpiredGracePeriod.php → .../API/User/isLicenseExpiredGracePeriod.php
diff --git a/tests/Unit/inc/Engine/Preload/Database/Queries/Cache/getOutdatedInProgressJobs.php b/tests/Unit/inc/Engine/Preload/Database/Queries/Cache/getOutdatedInProgressJobs.php
@@ -4,34 +4,41 @@
 
 use WP_Rocket\Engine\Preload\Database\Queries\Cache;
 use WP_Rocket\Tests\Unit\TestCase;
-use Brain\Monkey\Filters;
 
-class Test_GetOutdatedInProgressJobs extends TestCase
-{
+/**
+ * Test class covering Cache::get_outdated_in_progress_jobs
+ *
+ * @group Preload
+ */
+class Test_GetOutdatedInProgressJobs extends TestCase {
 	protected $query;
 
-	protected function setUp(): void
-	{
+	protected function setUp(): void {
 		parent::setUp();
-		$this->query = $this->createPartialMock(Cache::class, ['get_rows_by_url', 'query']);
+
+		$this->query = $this->createPartialMock( Cache::class, [ 'get_rows_by_url', 'query' ] );
 	}
 
 	/**
 	 * @dataProvider configTestData
 	 */
-	public function testShouldReturnAsExpected($config, $expected) {
-		$this->query->expects($this->at(0))->method('query')->with( [
-			'status'     => 'in-progress',
-			'is_locked'  => false,
-			'date_query' => [
-				[
-					'column' => 'modified',
-					'before' => '3 minute ago',
+	public function testShouldReturnAsExpected( $config, $expected ) {
+		$this->query->method( 'query' )->with(
+			[
+				'status'     => 'in-progress',
+				'is_locked'  => false,
+				'date_query' => [
+					[
+						'column' => 'modified',
+						'before' => '3 minute ago',
+					],
 				],
-			],
-		] )->willReturn( $config['results'] );
-
+			]
+		)->willReturn( $config['results'] );
 
-		$this->assertSame($expected, $this->query->get_outdated_in_progress_jobs());
+		$this->assertSame(
+			$expected,
+			$this->query->get_outdated_in_progress_jobs()
+		);
 	}
 }
diff --git a/tests/Unit/inc/Engine/Preload/Database/Queries/Cache/makeStatusComplete.php b/tests/Unit/inc/Engine/Preload/Database/Queries/Cache/makeStatusComplete.php
@@ -8,7 +8,6 @@
 
 /**
  * Test class covering \WP_Rocket\Engine\Preload\Database\Queries\Cache::make_status_complete
- * @uses \WP_Rocket\Engine\Preload\Database\Queries\CacheRow
  *
  * @group Database
  * @group Preload

diff --git a/tests/Unit/inc/Engine/Preload/Subscriber/excludePrivatePostUri.php b/tests/Unit/inc/Engine/Preload/Subscriber/excludePrivatePostUri.php
diff --git a/tests/Unit/inc/ThirdParty/Themes/Divi/addDiviToDescription.php b/tests/Unit/inc/ThirdParty/Themes/Divi/addDiviToDescription.php
@@ -10,7 +10,6 @@
 
 /**
  * Test class covering \WP_Rocket\ThirdParty\Themes\Divi::add_divi_to_description
- * @uses   \WP_Rocket\ThirdParty\Themes\Divi::is_divi
  *
  * @group  ThirdParty
  */

diff --git a/tests/Unit/inc/ThirdParty/Themes/Divi/disableDiviJqueryBody.php b/tests/Unit/inc/ThirdParty/Themes/Divi/disableDiviJqueryBody.php
@@ -7,11 +7,9 @@
 use Brain\Monkey\Functions;
 use WP_Rocket\ThirdParty\Themes\Divi;
 use WP_Theme;
-use Brain\Monkey\Filters;
 
 /**
  * Test class covering \WP_Rocket\ThirdParty\Themes\Divi::disable_divi_jquery_body
- * @uses   \WP_Rocket\ThirdParty\Themes\Divi::is_divi
  *
  * @group  ThirdParty
  */

diff --git a/tests/Unit/inc/ThirdParty/Themes/Divi/disableImageDimensionsHeightPercentage.php b/tests/Unit/inc/ThirdParty/Themes/Divi/disableImageDimensionsHeightPercentage.php
@@ -13,7 +13,6 @@
 
 /**
  * Test class covering \WP_Rocket\ThirdParty\Themes\Divi::disable_image_dimensions_height_percentage
- * @uses   \WP_Rocket\ThirdParty\Themes\Divi::is_divi
  *
  * @group  ThirdParty
  */

diff --git a/tests/Unit/inc/ThirdParty/Themes/Divi/removeAssetsGenerated.php b/tests/Unit/inc/ThirdParty/Themes/Divi/removeAssetsGenerated.php
@@ -14,7 +14,6 @@
 
 /**
  * Test class covering \WP_Rocket\ThirdParty\Themes\Divi::remove_assets_generated
- * @uses   \WP_Rocket\ThirdParty\Themes\Divi::is_divi
  *
  * @group  ThirdParty
  */

diff --git a/tests/Unit/inc/common/rocketGetPurgeUrls.php b/tests/Unit/inc/common/rocketGetPurgeUrls.php
@@ -42,7 +42,6 @@ public function setUp() : void {
 	 * @dataProvider providerTestData
 	 */
 	public function testShouldReturnUrls( $config, $expected ) {
-		$this->markTestSkipped('Error with require');
 		$post_id = isset( $config['post_data']['ID'] ) ? $config['post_data']['ID'] : 0;
 		$post    = isset( $config['post_data'] ) ? (object) $config['post_data'] : null;
 		$options = isset( $config['options'] ) ? $config['options'] : [];