diff options
author | Josh Cooper <josh@puppetlabs.com> | 2011-07-19 14:16:49 -0700 |
---|---|---|
committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-19 14:16:49 -0700 |
commit | 21c5929aae899e559e9a813c48424da4fcbec54b (patch) | |
tree | fa90342427d0cd41c6aea56df8d89d2deb3def9d /spec/unit/util/rdoc/parser_spec.rb | |
parent | d69bf48ecae71ff01679bb38cdeebc8f4a8b8b15 (diff) | |
parent | 0e4ae653c0628cb0df9ccace98bca4bc7478fb7c (diff) | |
download | puppet-21c5929aae899e559e9a813c48424da4fcbec54b.tar.gz puppet-21c5929aae899e559e9a813c48424da4fcbec54b.tar.xz puppet-21c5929aae899e559e9a813c48424da4fcbec54b.zip |
Merge branch 'feature/master/8268-puppet-agent-windows'
* feature/master/8268-puppet-agent-windows:
Maint: Fix miscellaneous tests
Maint: Don't test for extended signals on Windows
Maint: Tagged spec tests that are known to fail on Windows
Fix tests with "relative" paths on Windows
(#8268) Require windows drive letters in absolute file paths
(#8489) Consistently use File::PATH_SEPARATOR
Diffstat (limited to 'spec/unit/util/rdoc/parser_spec.rb')
-rwxr-xr-x | spec/unit/util/rdoc/parser_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/unit/util/rdoc/parser_spec.rb b/spec/unit/util/rdoc/parser_spec.rb index 92b50e09b..4c2c79e88 100755 --- a/spec/unit/util/rdoc/parser_spec.rb +++ b/spec/unit/util/rdoc/parser_spec.rb @@ -8,6 +8,8 @@ require 'rdoc/options' require 'rdoc/rdoc' describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do + include PuppetSpec::Files + before :each do File.stubs(:stat).with("init.pp") @top_level = stub_everything 'toplevel', :file_relative_name => "init.pp" @@ -21,7 +23,7 @@ describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do Puppet::Parser::Parser.stubs(:new).returns(parser) parser.expects(:parse).returns(Puppet::Parser::AST::Hostclass.new('')).at_least_once parser.expects(:file=).with("module/manifests/init.pp") - parser.expects(:file=).with("/dev/null/manifests/site.pp") + parser.expects(:file=).with(make_absolute("/dev/null/manifests/site.pp")) @parser.scan end |