summaryrefslogtreecommitdiffstats
path: root/spec/unit/util
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-04-13 16:57:11 -0700
committerNick Lewis <nick@puppetlabs.com>2011-04-13 16:57:11 -0700
commit5915814c47649bb4b957b4be4fcee5919b859451 (patch)
tree3c977fddfcfe7dd074682d62d44e919f450c3769 /spec/unit/util
parent24a277c5e805ce16e0b86e17e6cb2fbe1945ae07 (diff)
downloadpuppet-5915814c47649bb4b957b4be4fcee5919b859451.tar.gz
puppet-5915814c47649bb4b957b4be4fcee5919b859451.tar.xz
puppet-5915814c47649bb4b957b4be4fcee5919b859451.zip
Revert "(#6928) Removed --ignoreimport"
This reverts commit 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07. Despite not needing --ignoreimport as an option anymore, it's still used internally and has to stay.
Diffstat (limited to 'spec/unit/util')
-rwxr-xr-xspec/unit/util/rdoc_spec.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/unit/util/rdoc_spec.rb b/spec/unit/util/rdoc_spec.rb
index df5f6d2de..067b5b8a7 100755
--- a/spec/unit/util/rdoc_spec.rb
+++ b/spec/unit/util/rdoc_spec.rb
@@ -12,6 +12,12 @@ describe Puppet::Util::RDoc do
RDoc::RDoc.stubs(:new).returns(@rdoc)
end
+ it "should tell the parser to ignore import" do
+ Puppet.expects(:[]=).with(:ignoreimport, true)
+
+ Puppet::Util::RDoc.rdoc("output", [])
+ end
+
it "should install the Puppet HTML Generator into RDoc generators" do
Puppet::Util::RDoc.rdoc("output", [])
@@ -70,6 +76,12 @@ describe Puppet::Util::RDoc do
end
describe "when running a manifest documentation" do
+ it "should tell the parser to ignore import" do
+ Puppet.expects(:[]=).with(:ignoreimport, true)
+
+ Puppet::Util::RDoc.manifestdoc([])
+ end
+
it "should use a parser with the correct environment" do
FileTest.stubs(:file?).returns(true)
Puppet::Util::RDoc.stubs(:output)