From 675869f03b0043fb5082cc8da8993e76c1061afe Mon Sep 17 00:00:00 2001 From: Thrijith Thankachan Date: Sun, 17 Dec 2017 15:17:26 +0530 Subject: [PATCH 1/6] Replace use of "install" with "installation" --- src/Site_Command.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Site_Command.php b/src/Site_Command.php index d2d2aea91..7de0cfc94 100644 --- a/src/Site_Command.php +++ b/src/Site_Command.php @@ -1,7 +1,7 @@ Date: Mon, 18 Dec 2017 20:35:53 +0530 Subject: [PATCH 2/6] Replace use of "install" with "installation" update test files --- features/site-empty.feature | 2 +- features/site-option.feature | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/site-empty.feature b/features/site-empty.feature index bc30d40e4..f868922d6 100644 --- a/features/site-empty.feature +++ b/features/site-empty.feature @@ -13,7 +13,7 @@ Feature: Empty a WordPress site of its data When I try `wp site url 1` Then STDERR should be: """ - Error: This is not a multisite install. + Error: This is not a multisite installation. """ And the return code should be 1 diff --git a/features/site-option.feature b/features/site-option.feature index 98d4088df..e731a9e0b 100644 --- a/features/site-option.feature +++ b/features/site-option.feature @@ -116,14 +116,14 @@ Feature: Manage WordPress site options When I try `wp site option get str_opt` Then STDERR should be: """ - Error: This is not a multisite install. + Error: This is not a multisite installation. """ And the return code should be 1 When I try `wp site option add str_opt 'bar'` Then STDERR should be: """ - Error: This is not a multisite install. + Error: This is not a multisite installation. """ And the return code should be 1 From 34212d47535eef998e71d803cd3e232d88a0a674 Mon Sep 17 00:00:00 2001 From: Thrijith Thankachan Date: Mon, 18 Dec 2017 22:11:13 +0530 Subject: [PATCH 3/6] Replace use of "install" with "installation" update test files --- features/site-option.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/features/site-option.feature b/features/site-option.feature index e731a9e0b..c8e0d8a4a 100644 --- a/features/site-option.feature +++ b/features/site-option.feature @@ -110,8 +110,8 @@ Feature: Manage WordPress site options } """ - Scenario: Error on single install - Given a WP install + Scenario: Error on single installation + Given a WP installation When I try `wp site option get str_opt` Then STDERR should be: @@ -128,7 +128,7 @@ Feature: Manage WordPress site options And the return code should be 1 Scenario: Filter options by `--site_id` - Given a WP multisite install + Given a WP multisite installation When I run `wp db query "INSERT INTO wp_sitemeta (site_id,meta_key,meta_value) VALUES (2,'wp_cli_test_option','foobar');"` Then the return code should be 0 From 569990fdf988988dcb902f2f4fb378aa3f5ba1a1 Mon Sep 17 00:00:00 2001 From: Thrijith Thankachan Date: Mon, 18 Dec 2017 23:45:58 +0530 Subject: [PATCH 4/6] Replace use of "install" with "installation" update test files --- features/site-option.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/features/site-option.feature b/features/site-option.feature index c8e0d8a4a..e731a9e0b 100644 --- a/features/site-option.feature +++ b/features/site-option.feature @@ -110,8 +110,8 @@ Feature: Manage WordPress site options } """ - Scenario: Error on single installation - Given a WP installation + Scenario: Error on single install + Given a WP install When I try `wp site option get str_opt` Then STDERR should be: @@ -128,7 +128,7 @@ Feature: Manage WordPress site options And the return code should be 1 Scenario: Filter options by `--site_id` - Given a WP multisite installation + Given a WP multisite install When I run `wp db query "INSERT INTO wp_sitemeta (site_id,meta_key,meta_value) VALUES (2,'wp_cli_test_option','foobar');"` Then the return code should be 0 From 3c4a2232316d849c7bd712799edec813e74e6f7f Mon Sep 17 00:00:00 2001 From: Thrijith Thankachan Date: Tue, 19 Dec 2017 00:00:20 +0530 Subject: [PATCH 5/6] Replace use of "install" with "installation" update test files --- features/site-empty.feature | 4 ++-- features/site-option.feature | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/features/site-empty.feature b/features/site-empty.feature index f868922d6..f04fe85c3 100644 --- a/features/site-empty.feature +++ b/features/site-empty.feature @@ -1,7 +1,7 @@ Feature: Empty a WordPress site of its data Scenario: Empty a site - Given a WP install + Given a WP installation And I run `wp option update uploads_use_yearmonth_folders 0` And download: | path | url | @@ -43,7 +43,7 @@ Feature: Empty a WordPress site of its data Then STDOUT should be empty Scenario: Empty a site and its uploads directory - Given a WP multisite install + Given a WP multisite installation And I run `wp site create --slug=foo` And I run `wp --url=example.com/foo option update uploads_use_yearmonth_folders 0` And download: diff --git a/features/site-option.feature b/features/site-option.feature index e731a9e0b..de14b84a7 100644 --- a/features/site-option.feature +++ b/features/site-option.feature @@ -1,7 +1,7 @@ Feature: Manage WordPress site options Scenario: Site Option CRUD - Given a WP multisite install + Given a WP multisite installation # String values When I run `wp site option add str_opt 'bar'` @@ -111,7 +111,7 @@ Feature: Manage WordPress site options """ Scenario: Error on single install - Given a WP install + Given a WP installation When I try `wp site option get str_opt` Then STDERR should be: @@ -128,7 +128,7 @@ Feature: Manage WordPress site options And the return code should be 1 Scenario: Filter options by `--site_id` - Given a WP multisite install + Given a WP multisite installation When I run `wp db query "INSERT INTO wp_sitemeta (site_id,meta_key,meta_value) VALUES (2,'wp_cli_test_option','foobar');"` Then the return code should be 0 From d3b33dd3e2c123323c84b08186202b8412e09a79 Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Mon, 18 Dec 2017 11:40:43 -0800 Subject: [PATCH 6/6] Update one more instance of 'installation' --- entity-command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entity-command.php b/entity-command.php index f5a4e47d8..95a35c85e 100644 --- a/entity-command.php +++ b/entity-command.php @@ -30,7 +30,7 @@ WP_CLI::add_command( 'site option', 'Site_Option_Command', array( 'before_invoke' => function() { if ( !is_multisite() ) { - WP_CLI::error( 'This is not a multisite install.' ); + WP_CLI::error( 'This is not a multisite installation.' ); } } ) );