From 89a38a5dc2460359e4b24cce9d193331930eb91d Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Sat, 10 May 2014 00:42:58 -0400
Subject: [PATCH] Adjusted existing handlers and tests to honor shift argument

This will also ensure that the test cases do not break when new arguments
are added, since the existing conventions will remain unchanged.
---
 src/expect-core       |  9 ++++++---
 test/test-expect-core | 30 +++++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/expect-core b/src/expect-core
index b8b0dbc..c45f1db 100644
--- a/src/expect-core
+++ b/src/expect-core
@@ -40,8 +40,9 @@ _expect--fail()    { test "$1" -ne 0; }
 
 _expect--output()
 {
-  local -r cmp="$2"
-  shift 2
+  shift "$2"
+  local -r cmp="$1"
+  shift
   local -r clause="$*"
 
   local nl=
@@ -58,7 +59,9 @@ _expect--output()
 
 _expect--match()
 {
-  local -r pat="$2"
+  shift "$2"
+  local -r pat="$1"
+
   [[ "$(cat)" =~ $pat ]]
 }
 
diff --git a/test/test-expect-core b/test/test-expect-core
index 437e70d..01e21dd 100644
--- a/test/test-expect-core
+++ b/test/test-expect-core
@@ -22,12 +22,12 @@
 
 describe succeed
   it will succeed when command exits with status code 0
-    expect _expect--succeed 0
+    expect _expect--succeed 0 2
       to succeed
   end
 
   it will fail when command exits with non-zero status code
-    expect _expect--succeed 1
+    expect _expect--succeed 1 2
       to fail
   end
 end
@@ -35,12 +35,12 @@ end
 
 describe fail
   it will succeed when command exits with non-zero status code
-    expect _expect--fail 1
+    expect _expect--fail 1 2
       to succeed
   end
 
   it will fail when command exits with status code 0
-    expect _expect--fail 0
+    expect _expect--fail 0 2
       to fail
   end
 end
@@ -48,33 +48,33 @@ end
 
 describe output
   it will default to asserting against stdout
-    expect _expect--output 0 "test string" <<< "test string"
+    expect _expect--output 0 2 "test string" <<< "test string"
       to succeed
   end
 
   it ignores exit code
-    expect _expect--output 1 "foo" <<< "foo"
+    expect _expect--output 1 2 "foo" <<< "foo"
       to succeed
   end
 
   it fails on output mismatch
-    expect _expect--output 0 "foo" <<< "bar"
+    expect _expect--output 0 2 "foo" <<< "bar"
       to fail
   end
 
   # as is good practice for Unix utilities
   it expects trailing newline by default
-    expect _expect--output 0 "foo" < <( echo -n foo )
+    expect _expect--output 0 2 "foo" < <( echo -n foo )
       to fail
   end
 
   it can disable trailing newline check with "'without newline'" clause
-    expect _expect--output 0 "foo" without newline < <( echo -n foo )
+    expect _expect--output 0 2 "foo" without newline < <( echo -n foo )
       to succeed
   end
 
   it errors on any unrecognized clause
-    expect _expect--output 0 "foo" fluffy bunnies <<< "foo"
+    expect _expect--output 0 2 "foo" fluffy bunnies <<< "foo"
       to fail
   end
 end
@@ -82,25 +82,25 @@ end
 
 describe match
   it will default to asserting against stdout
-    expect _expect--match 0 "foo" <<< "foo"
+    expect _expect--match 0 2 "foo" <<< "foo"
       to succeed
   end
 
   it ignores exit code
-    expect _expect--match 1 "foo" <<< "foo"
+    expect _expect--match 1 2 "foo" <<< "foo"
       to succeed
   end
 
   it will perform partial match
-    expect _expect--match 0 "foo" <<< "contains foo"
+    expect _expect--match 0 2 "foo" <<< "contains foo"
       to succeed
   end
 
   it will match against a pattern
-    expect _expect--match 0 "^foo.*baz" <<< "foo bar baz"
+    expect _expect--match 0 2 "^foo.*baz" <<< "foo bar baz"
       to succeed
 
-    expect _expect--match 0 "^foo.*baz" <<< "bar foo bar baz"
+    expect _expect--match 0 2 "^foo.*baz" <<< "bar foo bar baz"
       to fail
   end
 end