From 676b4f0a279e06a347c02f343d866844ce07960c Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 16 Sep 2017 02:24:47 +0100
Subject: [PATCH 1/2] Adjust user tests 'spamed' -> 'spammed'.

---
 .gitignore            | 1 +
 composer.json         | 2 +-
 features/user.feature | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 54f24c800..5ce696eb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ node_modules/
 vendor/
 *.zip
 *.tar.gz
+*.swp
diff --git a/composer.json b/composer.json
index fbdb666ea..3fed441e3 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
     "require": {},
     "require-dev": {
         "behat/behat": "~2.5",
-        "wp-cli/wp-cli": "*",
+        "wp-cli/wp-cli": "dev-master",
         "phpunit/phpunit": "^4.8"
     },
     "extra": {
diff --git a/features/user.feature b/features/user.feature
index 3ad9fcdfc..718f70b17 100644
--- a/features/user.feature
+++ b/features/user.feature
@@ -338,7 +338,7 @@ Feature: Manage WordPress users
     Then STDOUT should be:
       """
       User {BBEE_ID} marked as spam.
-      Success: Spamed 1 of 1 users.
+      Success: Spammed 1 of 1 users.
       """
 
     When I try the previous command again
@@ -348,7 +348,7 @@ Feature: Manage WordPress users
       """
     And STDOUT should be:
       """
-      Success: User already spamed.
+      Success: User already spammed.
       """
 
     When I try `wp user spam {OP_ID} 9999`
@@ -360,6 +360,6 @@ Feature: Manage WordPress users
       """
       Warning: Invalid user ID, email or login: '9999'
       Warning: User 9999 doesn't exist.
-      Error: Only spamed 1 of 2 users.
+      Error: Only spammed 1 of 2 users.
       """
     And the return code should be 1

From 752dd67e2b2dd63d0a21ba2705b7da028c62233e Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 16 Sep 2017 18:34:23 +0100
Subject: [PATCH 2/2] Remove unneeded composer.json change & sneaky .gitignore
 change.

---
 .gitignore    | 1 -
 composer.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ce696eb1..54f24c800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ node_modules/
 vendor/
 *.zip
 *.tar.gz
-*.swp
diff --git a/composer.json b/composer.json
index 3fed441e3..fbdb666ea 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
     "require": {},
     "require-dev": {
         "behat/behat": "~2.5",
-        "wp-cli/wp-cli": "dev-master",
+        "wp-cli/wp-cli": "*",
         "phpunit/phpunit": "^4.8"
     },
     "extra": {