Resolve tests

Author: tijmenbruggeman

src/class-tiny-image.php

@@ -487,7 +487,18 @@ public function mark_as_compressed() {
 
 		$conversion_enabled = $this->settings->get_conversion_enabled();
 
-		foreach ( $this->sizes as $size ) {
+		$active_tinify_sizes = $this->settings->get_active_tinify_sizes();
+
+		if ( $this->settings->get_conversion_enabled() ) {
+			$uncompressed_sizes = $this->filter_image_sizes( 'uncompressed', $active_tinify_sizes );
+			$unconverted_sizes = $this->filter_image_sizes( 'unconverted', $active_tinify_sizes );
+
+			$unprocessed_sizes = $uncompressed_sizes + $unconverted_sizes;
+		} else {
+			$unprocessed_sizes = $this->filter_image_sizes( 'uncompressed', $active_tinify_sizes );
+		}
+
+		foreach ( $unprocessed_sizes as $size ) {
 			$size->mark_as_compressed( $conversion_enabled );
 		}
 

test/integration/compression.spec.ts

@@ -142,10 +142,11 @@ test.describe('compression', () => {
 
   test('button in edit screen should compress images', async () => {
     await setAPIKey(page, '');
-    await setCompressionTiming(page, 'auto');
+    await setCompressionTiming(page, 'manual');
     await enableCompressionSizes(page, ['medium', 'large']);
-    await uploadMedia(page, 'input-example.jpg');
     await setAPIKey(page, 'JPG123');
+    
+    await uploadMedia(page, 'input-example.jpg');
 
     await page.goto('/wp-admin/upload.php');
 
@@ -494,27 +495,32 @@ test.describe('compression', () => {
   });
 
   test('will mark a single attachment as compressed', async () => {
-    await uploadMedia(page, 'input-example.jpg');
+    await setAPIKey(page, 'JPG123');
     await setCompressionTiming(page, 'manual');
+    await enableCompressionSizes(page, ['0', 'medium']);
+    await uploadMedia(page, 'input-example.jpg');
 
     await page.goto('/wp-admin/upload.php');
 
     await page.getByRole('button', { name: 'Mark as Compressed' }).click();
-    await expect(page.getByText('5 sizes compressed')).toBeVisible();
-    await expect(page.getByText('5 sizes converted')).toBeVisible();
+    await expect(page.getByText('2 sizes compressed')).toBeVisible();
+    await expect(page.getByText('2 sizes converted')).toBeVisible();
   });
 
   test('will mark multiple attachments as compressed', async () => {
+    await setAPIKey(page, 'JPG123');
+    await setCompressionTiming(page, 'manual');
+    await enableCompressionSizes(page, ['0', 'medium']);
+    
     await uploadMedia(page, 'input-example.jpg');
     await uploadMedia(page, 'input-example.png');
-    await setCompressionTiming(page, 'manual');
 
     await page.goto('/wp-admin/upload.php');
 
     await page.locator('#cb-select-all-1').check();
     await page.locator('#bulk-action-selector-top').selectOption('tiny_bulk_mark_compressed');
     await page.locator('#doaction').click();
-    await expect(page.getByText('5 sizes compressed')).toBeVisible();
-    await expect(page.getByText('5 sizes converted')).toBeVisible();
+    await expect(page.getByText('2 sizes compressed')).toBeVisible();
+    await expect(page.getByText('2 sizes converted')).toBeVisible();
   });
 });