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/unit/parser/functions/generate_spec.rb | |
| parent | dac675c94e6ed1ee67a3081ba7379e000ee93c1c (diff) | |
| parent | 626d7564467bdc0e9d2d385e9aa10c539d9ed175 (diff) | |
| download | puppet-d4d51e3d7720108c063505884cca015aff77eff1.tar.gz puppet-d4d51e3d7720108c063505884cca015aff77eff1.tar.xz puppet-d4d51e3d7720108c063505884cca015aff77eff1.zip | |
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/unit/parser/functions/generate_spec.rb')
| -rwxr-xr-x | spec/unit/parser/functions/generate_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/parser/functions/generate_spec.rb b/spec/unit/parser/functions/generate_spec.rb index 27aabe261..12f454210 100755 --- a/spec/unit/parser/functions/generate_spec.rb +++ b/spec/unit/parser/functions/generate_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') describe "the generate function" do |