summaryrefslogtreecommitdiffstats
path: root/spec/unit/interface
diff options
context:
space:
mode:
authorPieter van de Bruggen <pieter@puppetlabs.com>2011-04-26 16:47:55 -0700
committerPieter van de Bruggen <pieter@puppetlabs.com>2011-04-26 16:47:55 -0700
commit1aaf5fdc51e165c7d0f377450016cd4fb3767c02 (patch)
tree4f0d014d232a2eec850b704c177b31f4b879e95e /spec/unit/interface
parentcd035426848154e8d11db5c59657d1b74258c9a0 (diff)
parentc627fad08c4866fbef300e887750c29963985635 (diff)
downloadpuppet-1aaf5fdc51e165c7d0f377450016cd4fb3767c02.tar.gz
puppet-1aaf5fdc51e165c7d0f377450016cd4fb3767c02.tar.xz
puppet-1aaf5fdc51e165c7d0f377450016cd4fb3767c02.zip
Merge branch 'tickets/2.7.x/7251' into 2.7.x
Diffstat (limited to 'spec/unit/interface')
-rwxr-xr-xspec/unit/interface/action_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/interface/action_spec.rb b/spec/unit/interface/action_spec.rb
index 24826a6ef..23d0de490 100755
--- a/spec/unit/interface/action_spec.rb
+++ b/spec/unit/interface/action_spec.rb
@@ -237,7 +237,7 @@ describe Puppet::Interface::Action do
when_invoked { }
end
end
- expect { face.bar }.to raise_error ArgumentError, /missing required options \(foo\)/
+ expect { face.bar }.to raise_error ArgumentError, /The following options are required: foo/
end
it "should fail when a required face option is not provided" do
@@ -245,7 +245,7 @@ describe Puppet::Interface::Action do
option('--foo') { required }
action(:bar) { when_invoked { } }
end
- expect { face.bar }.to raise_error ArgumentError, /missing required options \(foo\)/
+ expect { face.bar }.to raise_error ArgumentError, /The following options are required: foo/
end
end