Update behat tests per feedback

Author: Chris Wiegman

features/db-check.feature

@@ -13,6 +13,19 @@ Feature: Check the database
       Success: Database checked.
       """
 
+  Scenario: Run db check with MySQL defaults to check the database
+    Given a WP install
+
+    When I run `wp db check --defaults`
+    Then STDOUT should contain:
+      """
+      wp_cli_test.wp_users
+      """
+    And STDOUT should contain:
+      """
+      Success: Database checked.
+      """
+
   Scenario: Run db check with passed-in options
     Given a WP install
 
@@ -104,11 +117,11 @@ Feature: Check the database
     When I try `wp db check --defaults --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysqlcheck %s
+      Debug (db): Running shell command: /usr/bin/env mysqlcheck %s
       """
 
     When I try `wp db check --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysqlcheck --no-defaults %s
+      Debug (db): Running shell command: /usr/bin/env mysqlcheck --no-defaults %s
       """

features/db-export.feature

@@ -43,6 +43,15 @@ Feature: Export a WordPress database
       -- MySQL dump
       """
 
+  Scenario: Export database with mysql defaults to STDOUT
+    Given a WP install
+
+    When I run `wp db export --defaults -`
+    Then STDOUT should contain:
+      """
+      -- MySQL dump
+      """
+
   Scenario: Export database with passed-in options
     Given a WP install
 
@@ -60,17 +69,17 @@ Feature: Export a WordPress database
       """
     And STDOUT should be empty
 
-  Scenario: Ensure MySQL defaults are available when as appropriate with --defaults flag
+  Scenario: MySQL defaults are available as appropriate with --defaults flag
     Given a WP install
 
     When I try `wp db export --defaults --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysqldump
+      Debug (db): Running initial shell command: /usr/bin/env mysqldump
       """
 
     When I try `wp db export --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysqldump --no-defaults
+      Debug (db): Running initial shell command: /usr/bin/env mysqldump --no-defaults
       """

features/db-import.feature

@@ -12,6 +12,18 @@ Feature: Import a WordPress database
       Success: Imported from 'wp_cli_test.sql'.
       """
 
+  Scenario: Import from database name path by default with mysql defaults
+    Given a WP install
+
+    When I run `wp db export wp_cli_test.sql`
+    Then the wp_cli_test.sql file should exist
+
+    When I run `wp db import --defaults`
+    Then STDOUT should be:
+      """
+      Success: Imported from 'wp_cli_test.sql'.
+      """
+
   Scenario: Import from STDIN
     Given a WP install
 
@@ -104,7 +116,7 @@ Feature: Import a WordPress database
       """
       wp db import
       """
-  Scenario: Ensure MySQL defaults are available when as appropriate with --defaults flag
+  Scenario: MySQL defaults are available as appropriate with --defaults flag
     Given a WP install
 
     When I run `wp db export wp_cli_test.sql`
@@ -113,11 +125,11 @@ Feature: Import a WordPress database
     When I try `wp db import --defaults --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysql --no-auto-rehash
+      Debug (db): Running shell command: /usr/bin/env mysql --no-auto-rehash
       """
 
     When I try `wp db import --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysql --no-defaults --no-auto-rehash
+      Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
       """

features/db-query.feature

@@ -38,17 +38,34 @@ Feature: Query the database with WordPress' MySQL config
       """
     And STDOUT should be empty
 
-  Scenario: Ensure MySQL defaults are available when as appropriate with --defaults flag
+  Scenario: Database querying with MySQL defaults and passed-in options
+    Given a WP install
+
+    When I run `wp db query --defaults "SELECT COUNT(ID) FROM wp_posts;" --dbuser=wp_cli_test --html`
+    Then STDOUT should contain:
+      """
+      <TABLE
+      """
+
+    When I try `wp db query --defaults "SELECT COUNT(ID) FROM wp_posts;" --dbuser=no_such_user`
+	Then the return code should not be 0
+    And STDERR should contain:
+      """
+      Access denied
+      """
+    And STDOUT should be empty
+
+  Scenario: MySQL defaults are available as appropriate with --defaults flag
     Given a WP install
 
   When I try `wp db query --defaults --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysql --no-auto-rehash
+      Debug (db): Running shell command: /usr/bin/env mysql --no-auto-rehash
       """
 
     When I try `wp db query --debug`
     Then STDERR should contain:
       """
-      Debug (db): /usr/bin/env mysql --no-defaults --no-auto-rehash
+      Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
       """