Skip to content

Commit 4914998

Browse files
Only run on 4.7 and above
1 parent ec505a0 commit 4914998

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

bin/run-mocks

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,11 @@ MOCK_PORT=${port:-8100}
77
docker build -t mock-webservice -f config/Dockerfile-mock-webservice .
88
docker run -d --name tinify-mock-api -p ${MOCK_PORT}:80 -v $(pwd)/test/mock-tinypng-webservice:/var/www/html mock-webservice
99

10+
echo "Replacing configuration files..."
11+
mv src/vendor/tinify/Tinify/Client.php src/vendor/tinify/Tinify/Client.php.bak
12+
cp test/fixtures/Client.php src/vendor/tinify/Tinify/Client.php
13+
14+
mv src/config/class-tiny-config.php src/config/class-tiny-config.php.bak
15+
cp test/fixtures/class-tiny-config.php src/config/class-tiny-config.php
16+
1017
echo "To stop, run: bin/stop-mocks"

bin/stop-mocks

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
#!/bin/bash
22

3+
echo "Putting back configuration files..."
4+
mv src/config/class-tiny-config.php.bak src/config/class-tiny-config.php
5+
mv src/vendor/tinify/Tinify/Client.php.bak src/vendor/tinify/Tinify/Client.php
6+
7+
echo "Shutting down containers..."
38
docker stop $(docker ps -q --filter "ancestor=mock-webservice")
49
docker rm $(docker ps -a -q --filter "ancestor=mock-webservice")

test/integration/compression.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,12 @@ test.describe('compression', () => {
458458
await expect(page.getByRole('button', { name: 'Compress' })).not.toBeVisible();
459459
});
460460

461-
// This is failing as images stay uncompressed
462461
test('compresses images upload via JSON API', async () => {
462+
if (WPVersion < 4.7) {
463+
// Content REST API was introduced in 4.7
464+
return;
465+
}
466+
463467
await setAPIKey(page, 'JPG123');
464468
await setCompressionTiming(page, 'auto');
465469
await enableCompressionSizes(page, ['0', 'medium']);

test/integration/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export async function uploadMedia(page: Page, file: string) {
1414

1515
export async function clearMediaLibrary(page: Page) {
1616
await page.goto('/wp-admin/upload.php?mode=list');
17-
const hasNoFiles = await page.getByText('No media files found.').isVisible();
17+
const hasNoFiles = await page.getByText('No media').isVisible();
1818
if (hasNoFiles) {
1919
return;
2020
}

0 commit comments

Comments
 (0)