diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 13:05:27 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 13:05:27 -0800 |
| commit | d4d51e3d7720108c063505884cca015aff77eff1 (patch) | |
| tree | bff625caf757ccd42b3e8dd902214531efb41fdf /spec/integration/node | |
| parent | dac675c94e6ed1ee67a3081ba7379e000ee93c1c (diff) | |
| parent | 626d7564467bdc0e9d2d385e9aa10c539d9ed175 (diff) | |
Merge branch 'ticket/next/maint-require_spec_helper' into next
* ticket/next/maint-require_spec_helper:
maint: Use expand_path when requiring spec_helper or puppettest
maint: Fix more order dependent test failures
Diffstat (limited to 'spec/integration/node')
| -rwxr-xr-x | spec/integration/node/environment_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/node/facts_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/node/environment_spec.rb b/spec/integration/node/environment_spec.rb index 8c5153749..abf0108fa 100755 --- a/spec/integration/node/environment_spec.rb +++ b/spec/integration/node/environment_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') require 'puppet_spec/files' diff --git a/spec/integration/node/facts_spec.rb b/spec/integration/node/facts_spec.rb index a555b2044..ee956a6b1 100755 --- a/spec/integration/node/facts_spec.rb +++ b/spec/integration/node/facts_spec.rb @@ -3,7 +3,7 @@ # Created by Luke Kanies on 2008-4-8. # Copyright (c) 2008. All rights reserved. -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Puppet::Node::Facts do describe "when using the indirector" do |