summaryrefslogtreecommitdiffstats
path: root/spec/integration/application/doc_spec.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-10-04 12:22:44 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-10-04 12:22:47 -0700
commit1a00c07971c4297bce1b3e0edee3b6b3399e17bb (patch)
tree0a8b1f1be1eddcb31e1b0ff7d69dbb60bd1c7e81 /spec/integration/application/doc_spec.rb
parentd43f7996b93c394df0bd0994ae7298fb35ad2c5e (diff)
parent66cf3a925b4b6d9b40cbdf95f2be6575bb05a881 (diff)
downloadpuppet-1a00c07971c4297bce1b3e0edee3b6b3399e17bb.tar.gz
puppet-1a00c07971c4297bce1b3e0edee3b6b3399e17bb.tar.xz
puppet-1a00c07971c4297bce1b3e0edee3b6b3399e17bb.zip
Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next
There are test failures in commits following this one.
Diffstat (limited to 'spec/integration/application/doc_spec.rb')
-rw-r--r--spec/integration/application/doc_spec.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/integration/application/doc_spec.rb b/spec/integration/application/doc_spec.rb
index cb9f47868..eaf5442a0 100644
--- a/spec/integration/application/doc_spec.rb
+++ b/spec/integration/application/doc_spec.rb
@@ -45,4 +45,11 @@ describe Puppet::Application::Doc do
Dir.chdir(old_dir)
end
end
+
+ it "should respect the -o option" do
+ puppetdoc = Puppet::Application[:doc]
+ puppetdoc.command_line.stubs(:args).returns(['foo', '-o', 'bar'])
+ puppetdoc.parse_options
+ puppetdoc.options[:outputdir].should == 'bar'
+ end
end