@@ -121,38 +121,28 @@ test.describe('bulkoptimization', () => {
121121 } ) ;
122122
123123 test ( 'summary should display correct values' , async ( ) => {
124- await setAPIKey ( page , 'JPG123 ' ) ;
124+ await setAPIKey ( page , 'PNG123 ' ) ;
125125 await setCompressionTiming ( page , 'auto' ) ;
126126
127127 await enableCompressionSizes ( page , [ ] ) ;
128- await uploadMedia ( page , 'input-example.jpg ' ) ;
128+ await uploadMedia ( page , 'input-example.png ' ) ;
129129
130130 await enableCompressionSizes ( page , [ '0' ] ) ;
131- await uploadMedia ( page , 'input-example.jpg ' ) ;
131+ await uploadMedia ( page , 'input-example.png ' ) ;
132132
133- await enableCompressionSizes ( page , [ '0' , 'thumbnail' , 'medium' ] ) ;
134- await uploadMedia ( page , 'input-example.jpg ' ) ;
133+ await enableCompressionSizes ( page , [ '0' , 'thumbnail' ] ) ;
134+ await uploadMedia ( page , 'input-example.png ' ) ;
135135
136136 await page . goto ( '/wp-admin/upload.php?page=tiny-bulk-optimization' ) ;
137137
138+ // We uploaded 3 images
138139 await expect ( page . locator ( '#uploaded-images' ) ) . toHaveText ( '3' ) ;
139- await expect ( page . locator ( '#optimizable-image-sizes' ) ) . toHaveText ( '5' ) ;
140- await expect ( page . locator ( '#optimized-image-sizes' ) ) . toHaveText ( '4' ) ;
140+ // 3 sizes can still be optimized, first upload original and thumbnail, second upload only thumbnail
141+ await expect ( page . locator ( '#optimizable-image-sizes' ) ) . toHaveText ( '3' ) ;
142+ // 3 sizes are optimized, first upload original and thumbnail, second upload only original
143+ await expect ( page . locator ( '#optimized-image-sizes' ) ) . toHaveText ( '3' ) ;
141144
142- if ( WPVersion < 5.7 ) {
143- await expect ( page . locator ( '#unoptimized-library-size' ) ) . toHaveText ( '3.03 MB' ) ;
144- await expect ( page . locator ( '#optimized-library-size' ) ) . toHaveText ( '2.36 MB' ) ;
145- await expect ( page . locator ( '#savings-percentage' ) ) . toHaveText ( '22.2%' ) ;
146- } else if ( WPVersion < 6.0 ) {
147- await expect ( page . locator ( '#unoptimized-library-size' ) ) . toHaveText ( '3.57 MB' ) ;
148- await expect ( page . locator ( '#optimized-library-size' ) ) . toHaveText ( '2.90 MB' ) ;
149- await expect ( page . locator ( '#savings-percentage' ) ) . toHaveText ( '18.9%' ) ;
150- } else {
151- await expect ( page . locator ( '#unoptimized-library-size' ) ) . toHaveText ( '2.84 MB' ) ;
152- await expect ( page . locator ( '#optimized-library-size' ) ) . toHaveText ( '2.16 MB' ) ;
153- await expect ( page . locator ( '#savings-percentage' ) ) . toHaveText ( '23.8%' ) ;
154- }
155- await expect ( page . locator ( '#compression-progress-bar' ) ) . toHaveText ( '4 / 9 (44%)' ) ;
145+ await expect ( page . locator ( '#compression-progress-bar' ) ) . toHaveText ( '3 / 6 (50%)' ) ;
156146 } ) ;
157147
158148 test ( 'start bulk optimization should optimize remaining images' , async ( ) => {
0 commit comments