Use _require_argument() name consistently and update tests.

These changes are an extension of afd50eb, which was incomplete.
xwmx · Jan 26, 2016 · 349962b · 349962b
1 parent afd50eb
commit 349962b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bash-simple-plus b/bash-simple-plus
@@ -390,12 +390,12 @@ do
       _OPTION_X=1
       ;;
     -o)
-      _require_parameter "$_option" "$_maybe_param"
+      _require_argument "$_option" "$_maybe_param"
       _SHORT_OPTION_WITH_PARAMETER="${_maybe_param}"
        shift
       ;;
     --long-option-with-argument)
-      _require_parameter "$_option" "$_maybe_param"
+      _require_argument "$_option" "$_maybe_param"
       _LONG_OPTION_WITH_PARAMETER="${_maybe_param}"
       shift
       ;;

diff --git a/test/bash-simple-plus.bats b/test/bash-simple-plus.bats
@@ -74,7 +74,7 @@ setup() {
 
 @test "\`bash-simple-plus -o\` with no value prints message." {
   run "$_COMMAND" -o
-  [[ "$output" =~ Option\ requires\ a\ parameter ]]
+  [[ "$output" == "❌  Option requires a argument: -o" ]]
 }
 
 @test "\`bash-simple-plus -o\` with value exits with status 0." {
@@ -95,7 +95,7 @@ setup() {
 
 @test "\`bash-simple-plus\` with long option and missing required value prints message." {
   run "$_COMMAND" --long-option-with-argument
-  [[ "$output" =~ Option\ requires\ a\ parameter ]]
+  [[ "$output" =~ "❌  Option requires a argument: --long-option-with-argument" ]]
 }
 
 @test "\`bash-simple-plus\` with option and required value exits with status 0." {