From 08f9d1f565e9e73bad3ca320d226e8901f34da99 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Fri, 28 Jun 2024 10:33:41 +0200 Subject: [PATCH 1/2] Fix test for WordPress trunk `siteurl` is not necessarily the first row in `wp_options`. It appears that other options such as `cron` can be first. This removes the option ID from the assertion, as it is not relevant. We only want to verify that the site URL changed. --- features/search-replace-export.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/search-replace-export.feature b/features/search-replace-export.feature index d645b9ff..a7876454 100644 --- a/features/search-replace-export.feature +++ b/features/search-replace-export.feature @@ -14,7 +14,7 @@ Feature: Search / replace with file export """ And STDOUT should contain: """ - ('1', 'siteurl', 'https://example.net', + 'siteurl', 'https://example.net', """ When I run `wp option get home` From 999e18f9040016a7036f82f6f2246f34355d5d46 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Fri, 28 Jun 2024 10:44:05 +0200 Subject: [PATCH 2/2] Fix more instances --- features/search-replace-export.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/search-replace-export.feature b/features/search-replace-export.feature index a7876454..20eacfa5 100644 --- a/features/search-replace-export.feature +++ b/features/search-replace-export.feature @@ -54,13 +54,13 @@ Feature: Search / replace with file export """ And STDOUT should contain: """ - ('1', 'siteurl', 'https://example.com' + 'siteurl', 'https://example.com' """ When I run `wp search-replace example.com example.net --skip-columns=option_value --export --export_insert_size=1` Then STDOUT should contain: """ - ('1', 'siteurl', 'https://example.com' + 'siteurl', 'https://example.com' """ And STDOUT should contain: """