summaryrefslogtreecommitdiffstats
path: root/spec/unit/interface
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-07-28 15:08:00 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-07-28 15:20:54 -0700
commit023d9597b9895f57fda05dc79adad41684179eb2 (patch)
tree4afcc71e22a35d548f138b90e4fbc03157652084 /spec/unit/interface
parentbad0442f78d42fbdce3555faefa80886618f0001 (diff)
downloadpuppet-023d9597b9895f57fda05dc79adad41684179eb2.tar.gz
puppet-023d9597b9895f57fda05dc79adad41684179eb2.tar.xz
puppet-023d9597b9895f57fda05dc79adad41684179eb2.zip
(#8690) Accept 'global' options in Puppet Faces
When we introduced verification of options, we forgot to handle the case that global options from the Puppet settings system could be passed to the face. This, in turn, means that the system would fail if you used any of those. This remediates that, and now these work as expected. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
Diffstat (limited to 'spec/unit/interface')
-rwxr-xr-xspec/unit/interface/action_spec.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/unit/interface/action_spec.rb b/spec/unit/interface/action_spec.rb
index c3f08e817..6b68eb149 100755
--- a/spec/unit/interface/action_spec.rb
+++ b/spec/unit/interface/action_spec.rb
@@ -552,7 +552,7 @@ describe Puppet::Interface::Action do
context "#validate_and_clean" do
subject do
Puppet::Interface.new(:validate_args, '1.0.0') do
- script :test do |options| true end
+ script :test do |options| options end
end
end
@@ -576,6 +576,12 @@ describe Puppet::Interface::Action do
expect { subject.test :unknown => true, :unseen => false }.
to raise_error ArgumentError, /Unknown options passed: unknown, unseen/
end
+
+ it "should accept 'global' options from settings" do
+ expect {
+ subject.test(:certname => "true").should == { :certname => "true" }
+ }.not_to raise_error
+ end
end
context "default option values" do