Merge remote-tracking branch 'origin/1.x' into timber-2.x

mindkomm · Sep 12, 2023 · 9f95658 · 9f95658
2 parents c44ea0c + 4e77d3e
commit 9f95658
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,12 +25,13 @@ jobs:
       mysql:
         image: mariadb:latest
         env:
+          MYSQL_USER: root
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_ROOT_PASSWORD: ''
           MYSQL_DATABASE: wordpress_test
         ports:
           - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+        options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
 
     continue-on-error: ${{ matrix.experimental }}
     strategy:

diff --git a/tests/test-webp.php b/tests/test-webp.php
@@ -171,7 +171,7 @@ public function test_timmy_ignores_gif_when_using_webp() {
 
 		$result   = $image->picture_responsive();
 		$expected = sprintf(
-			'<source srcset="%1$s/logo-small.gif">%2$s<img src="http://example.org/wp-content/uploads/2023/04/logo-small.gif" width="100" height="50" alt="" loading="lazy">',
+			'<source srcset="%1$s/logo-small.gif">%2$s<img src="%1$s/logo-small.gif" width="100" height="50" alt="" loading="lazy">',
 			$this->get_upload_url(),
 			PHP_EOL
 		);