fix test conditions for settings functions that now return empty strings

nosilver4u · Jun 5, 2023 · 042c3d4 · 042c3d4
1 parent bfe1526
commit 042c3d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/common.php b/common.php
@@ -3508,7 +3508,7 @@ function ewww_image_optimizer_jpg_background( $background = null ) {
 		}
 		// Send back a blank value.
 		ewwwio_memory( __FUNCTION__ );
-		return null;
+		return '';
 	}
 }
 

diff --git a/tests/test-options.php b/tests/test-options.php
@@ -20,10 +20,10 @@ function test_jpg_background() {
 		$this->assertEquals( 'fff333', ewww_image_optimizer_jpg_background() );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_background', '' );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_background', '#fff' );
-		$this->assertNull( ewww_image_optimizer_jpg_background() );
+		$this->assertEquals( '', ewww_image_optimizer_jpg_background() );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_background', '' );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_background', 'black' );
-		$this->assertNull( ewww_image_optimizer_jpg_background() );
+		$this->assertEquals( '', ewww_image_optimizer_jpg_background() );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_background', '' );
 	}
 
@@ -32,15 +32,15 @@ function test_jpg_background() {
 	 */
 	function test_jpg_quality() {
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_quality', 1000 );
-		$this->assertNull( ewww_image_optimizer_jpg_quality() );
+		$this->assertEquals( '', ewww_image_optimizer_jpg_quality() );
 		$this->assertEquals( 82, (int) apply_filters( 'jpeg_quality', 82, 'image/webp' ) );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_quality', '' );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_quality', 75 );
 		$this->assertEquals( 75, ewww_image_optimizer_jpg_quality() );
 		$this->assertEquals( 75, (int) apply_filters( 'jpeg_quality', 82, 'image/webp' ) );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_quality', '' );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_quality', 'spinach' );
-		$this->assertNull( ewww_image_optimizer_jpg_quality() );
+		$this->assertEquals( '', ewww_image_optimizer_jpg_quality() );
 		ewww_image_optimizer_set_option( 'ewww_image_optimizer_jpg_quality', '' );
 	}
 }