Remove unused chained_command; set & warn _SERVER['SERVER_NAME']; return code checks.

gitlost · gitlost · commit 3caa40174885 · 2017-11-18T00:29:53.000Z
diff --git a/features/comment-meta.feature b/features/comment-meta.feature
@@ -17,6 +17,7 @@ Feature: Manage comment custom fields
       """
       Error: Could not find the comment with ID 999999.
       """
+    And the return code should be 1
 
     When I run `wp comment-meta set 1 foo '[ "1", "2" ]' --format=json`
     Then STDOUT should not be empty
@@ -42,6 +43,7 @@ Feature: Manage comment custom fields
       Error: Parameter errors:
        unknown -- hi parameter
       """
+    And the return code should be 1
 
     When I run `wp comment meta add 1 foo '"-- hi"' --format=json`
     Then STDOUT should contain:
diff --git a/features/comment.feature b/features/comment.feature
@@ -46,6 +46,7 @@ Feature: Manage WordPress comments
       """
       Error: Invalid comment ID.
       """
+    And the return code should be 1
 
     When I run `wp comment create --comment_post_ID=1`
     And I run `wp comment create --comment_post_ID=1`
@@ -67,6 +68,7 @@ Feature: Manage WordPress comments
       """
       Error: Invalid comment ID.
       """
+    And the return code should be 1
 
   Scenario: Get details about an existing comment
     When I run `wp comment get 1`
@@ -154,7 +156,7 @@ Feature: Manage WordPress comments
     Given I run `wp comment create --comment_post_ID=1 --comment_approved=0 --porcelain`
     And save STDOUT as {COMMENT_ID}
 
-    When I run `wp comment approve {COMMENT_ID}`
+    When I run `wp comment approve {COMMENT_ID} --url=www.example.com`
     Then STDOUT should contain:
       """
       Approved comment {COMMENT_ID}
@@ -166,7 +168,7 @@ Feature: Manage WordPress comments
       1
       """
 
-    When I run `wp comment unapprove {COMMENT_ID}`
+    When I run `wp comment unapprove {COMMENT_ID} --url=www.example.com`
     Then STDOUT should contain:
       """
       Unapproved comment {COMMENT_ID}
@@ -178,13 +180,47 @@ Feature: Manage WordPress comments
       0
       """
 
+    When I try `wp comment approve {COMMENT_ID}`
+    Then STDOUT should contain:
+      """
+      Approved comment {COMMENT_ID}
+      """
+    And STDERR should contain:
+      """
+      Warning: `$_SERVER['SERVER_NAME']` not set. Setting to 'example.com'. Notification email sent to post author may appear to come from 'example.com'.
+      """
+    And the return code should be 0
+
+    When I run `wp comment get --field=comment_approved {COMMENT_ID}`
+    Then STDOUT should be:
+      """
+      1
+      """
+
+    When I try `wp comment unapprove {COMMENT_ID}`
+    Then STDOUT should contain:
+      """
+      Unapproved comment {COMMENT_ID}
+      """
+    And STDERR should contain:
+      """
+      Warning: `$_SERVER['SERVER_NAME']` not set. Setting to 'example.com'. Notification email sent to post author may appear to come from 'example.com'.
+      """
+    And the return code should be 0
+
+    When I run `wp comment get --field=comment_approved {COMMENT_ID}`
+    Then STDOUT should be:
+      """
+      0
+      """
+
   Scenario: Approving/unapproving comments with multidigit comment ID
     Given I run `wp comment delete $(wp comment list --field=ID)`
     And I run `wp comment generate --count=10 --quiet`
     And I run `wp comment create --porcelain`
     And save STDOUT as {COMMENT_ID}
 
-    When I run `wp comment unapprove {COMMENT_ID}`
+    When I run `wp comment unapprove {COMMENT_ID} --url=www.example.com`
     Then STDOUT should contain:
       """
       Unapproved comment {COMMENT_ID}
@@ -196,7 +232,7 @@ Feature: Manage WordPress comments
       10
       """
 
-    When I run `wp comment approve {COMMENT_ID}`
+    When I run `wp comment approve {COMMENT_ID} --url=www.example.com`
     Then STDOUT should contain:
       """
       Approved comment {COMMENT_ID}
diff --git a/features/menu-location.feature b/features/menu-location.feature
@@ -35,13 +35,15 @@ Feature: Manage WordPress menu locations
       """
       Error: Invalid menu secondary-menu.
       """
+    And the return code should be 1
 
     When I run `wp menu create "Secondary Menu"`
     And I try `wp menu location assign secondary-menu secondary`
     Then STDERR should be:
       """
       Error: Invalid location secondary.
       """
+    And the return code should be 1
 
     When I run `wp menu location assign secondary-menu primary`
     Then STDOUT should be:
diff --git a/features/menu.feature b/features/menu.feature
@@ -62,6 +62,7 @@ Feature: Manage WordPress menus
       Warning: Couldn't delete menu 'Your menu'.
       Error: No menus deleted.
       """
+    And the return code should be 1
 
     When I run `wp menu create "My Menu"`
     And I run `wp menu list --fields=name,slug`
diff --git a/features/network-meta.feature b/features/network-meta.feature
@@ -3,7 +3,7 @@ Feature: Manage network-wide custom fields.
   Scenario: Non-multisite
     Given a WP install
 
-    When I try `wp network-meta`
+    When I run `wp network-meta`
     Then STDOUT should contain:
       """
       usage: wp network meta
@@ -15,3 +15,4 @@ Feature: Manage network-wide custom fields.
       """
       This is not a multisite install.
       """
+    And the return code should be 1
diff --git a/features/post-meta.feature b/features/post-meta.feature
@@ -17,6 +17,7 @@ Feature: Manage post custom fields
       """
       Error: Could not find the post with ID 999999.
       """
+    And the return code should be 1
 
     When I run `wp post-meta set 1 foo '[ "1", "2" ]' --format=json`
     Then STDOUT should not be empty
@@ -116,6 +117,7 @@ Feature: Manage post custom fields
       """
       Error: Please specify a meta key, or use the --all flag.
       """
+    And the return code should be 1
 
     When I run `wp post meta delete 1 --all`
     Then STDOUT should contain:
@@ -443,4 +445,4 @@ Feature: Manage post custom fields
     Then STDOUT should be JSON containing:
       """
       [ "new", "bar" ]
-      """
+      """
diff --git a/features/post-term.feature b/features/post-term.feature
@@ -37,6 +37,7 @@ Feature: Manage post term
       """
       Error: Invalid taxonomy foo2.
       """
+    And the return code should be 1
 
     When I run `wp post term set 1 category new`
     Then STDOUT should be:
@@ -214,3 +215,4 @@ Feature: Manage post term
       """
       Error: No need to specify terms while removing all terms.
       """
+    And the return code should be 1
diff --git a/features/post-type.feature b/features/post-type.feature
@@ -16,6 +16,7 @@ Feature: Manage WordPress post types
       """
       Error: Post type invalid-post-type doesn't exist.
       """
+    And the return code should be 1
 
     When I run `wp post-type get page`
     Then STDOUT should be a table containing rows:
diff --git a/features/post.feature b/features/post.feature
@@ -88,7 +88,7 @@ Feature: Manage WordPress posts
       """
     And the return code should be 0
 
-    When I try `EDITOR='ex -i NONE -c %s/content/bunkum -c wq' wp post edit {POST_ID}`
+    When I run `EDITOR='ex -i NONE -c %s/content/bunkum -c wq' wp post edit {POST_ID}`
     Then STDERR should be empty
     Then STDOUT should contain:
       """
@@ -155,6 +155,7 @@ Feature: Manage WordPress posts
       """
       Error: Unable to read content from 'invalid-file.html'.
       """
+    And the return code should be 1
 
   Scenario: Creating/listing posts
     When I run `wp post create --post_title='Publish post' --post_content='Publish post content' --post_status='publish' --porcelain`
diff --git a/features/site-empty.feature b/features/site-empty.feature
@@ -15,6 +15,7 @@ Feature: Empty a WordPress site of its data
       """
       Error: This is not a multisite install.
       """
+    And the return code should be 1
 
     When I run `wp post create --post_title='Test post' --post_content='Test content.' --porcelain`
     Then STDOUT should be:
diff --git a/features/site-option.feature b/features/site-option.feature
@@ -118,12 +118,14 @@ Feature: Manage WordPress site options
       """
       Error: This is not a multisite install.
       """
+    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.
       """
+    And the return code should be 1
 
   Scenario: Filter options by `--site_id`
     Given a WP multisite install
diff --git a/features/site.feature b/features/site.feature
@@ -176,7 +176,7 @@ Feature: Manage sites in a multisite installation
       Success: Site {FIRST_SITE} unarchived.
       """
 
-    When I try `wp site list --fields=blog_id,archived`
+    When I run `wp site list --fields=blog_id,archived`
     Then STDOUT should be a table containing rows:
       | blog_id      | archived |
       | {FIRST_SITE} | 0        |
diff --git a/features/taxonomy.feature b/features/taxonomy.feature
@@ -22,6 +22,7 @@ Feature: Manage WordPress taxonomies
       """
       Error: Taxonomy invalid-taxonomy doesn't exist.
       """
+    And the return code should be 1
 
     When I run `wp taxonomy get category`
     Then STDOUT should be a table containing rows:
diff --git a/features/term-meta.feature b/features/term-meta.feature
@@ -18,6 +18,7 @@ Feature: Manage term custom fields
       """
       Error: Could not find the term with ID 999999.
       """
+    And the return code should be 1
 
     When I run `wp term meta set 1 foo '[ "1", "2" ]' --format=json`
     Then STDOUT should not be empty
diff --git a/features/term-recount.feature b/features/term-recount.feature
@@ -10,16 +10,17 @@ Feature: Recount terms on a taxonomy
       """
       Warning: Taxonomy some-fake-taxonomy does not exist.
       """
+    And the return code should be 0
 
   Scenario: Term recount with a valid taxonomy
-    When I try `wp term recount category`
+    When I run `wp term recount category`
     Then STDOUT should be:
       """
       Success: Updated category term count.
       """
 
   Scenario: Term recount with a multiple taxonomies
-    When I try `wp term recount category post_tag`
+    When I run `wp term recount category post_tag`
     Then STDOUT should be:
       """
       Success: Updated category term count.
diff --git a/features/term.feature b/features/term.feature
@@ -10,6 +10,7 @@ Feature: Manage WordPress terms
 
     When I try the previous command again
     Then STDERR should not be empty
+    And the return code should be 1
 
     When I run `wp term list post_tag --format=json`
     Then STDOUT should be JSON containing:
@@ -54,6 +55,7 @@ Feature: Manage WordPress terms
       """
       Error: Taxonomy nonexistent_taxonomy doesn't exist.
       """
+    And the return code should be 1
 
   Scenario: Creating/deleting a term
     When I run `wp term create post_tag 'Test delete term' --slug=test-delete --description='This is a test term to be deleted' --porcelain`
@@ -107,6 +109,7 @@ Feature: Manage WordPress terms
       """
       Error: Parent term does not exist.
       """
+    And the return code should be 1
 
   Scenario: Filter terms by term_id
     When I run `wp term generate category --count=10`
diff --git a/features/user-generate.feature b/features/user-generate.feature
@@ -18,7 +18,17 @@ Feature: Generate WP users
       """
 
     When I try `wp user list --field=ID | xargs wp user delete invalid-user --yes`
-    And I run `wp user list --format=count`
+    Then STDOUT should contain:
+      """
+      Success: Removed user
+      """
+    And STDERR should be:
+      """
+      Warning: Invalid user ID, email or login: 'invalid-user'
+      """
+    And the return code should be 0
+
+    When I run `wp user list --format=count`
     Then STDOUT should be:
       """
       0
diff --git a/features/user-import-csv.feature b/features/user-import-csv.feature
@@ -15,6 +15,7 @@ Feature: Import users from CSV
       """
       Error: Missing file: users-incorrect.csv
       """
+    And the return code should be 1
 
     When I run `wp user import-csv users.csv`
     Then STDOUT should not be empty
@@ -51,10 +52,11 @@ Feature: Import users from CSV
       """
 
     When I try `wp user import-csv user-invalid.csv`
-    Then STDERR should contain:
+    Then STDERR should be:
       """
-      lowercase letters (a-z) and numbers
+      Warning: Usernames can only contain lowercase letters (a-z) and numbers.
       """
+    And the return code should be 0
 
     When I run `wp user import-csv user-valid.csv`
     Then STDOUT should not be empty
@@ -151,6 +153,7 @@ Feature: Import users from CSV
       """
       Error: Unable to read content from STDIN.
       """
+    And the return code should be 1
 
     When I run `cat users.csv | wp user import-csv -`
     Then STDOUT should be:
diff --git a/features/user-meta.feature b/features/user-meta.feature
@@ -17,6 +17,7 @@ Feature: Manage user custom fields
       """
       Error: Invalid user ID, email or login: '2'
       """
+    And the return code should be 1
 
     When I run `wp user-meta set admin foo '[ "1", "2" ]' --format=json`
     Then STDOUT should not be empty
diff --git a/features/user.feature b/features/user.feature
diff --git a/src/Comment_Command.php b/src/Comment_Command.php
diff --git a/src/User_Command.php b/src/User_Command.php
