diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-11-22 15:02:12 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-11-22 15:02:12 -0800 |
| commit | 9914140377a82b6c2de45685f565b2607d8b8364 (patch) | |
| tree | 4b0da9bf07dfd0e0a6be747019af58275b57b6b8 /spec/unit/parser | |
| parent | a95783f6d6044789e6a0408976126757d4e9f084 (diff) | |
| parent | 4a2bbbcf197760ce2eb3c257742293794d6fb571 (diff) | |
| download | puppet-9914140377a82b6c2de45685f565b2607d8b8364.tar.gz puppet-9914140377a82b6c2de45685f565b2607d8b8364.tar.xz puppet-9914140377a82b6c2de45685f565b2607d8b8364.zip | |
Merge branch 'maint/next/all_tests_run_on_their_own' into next
* maint/next/all_tests_run_on_their_own:
maint: Fix tests that don't run on their own
Diffstat (limited to 'spec/unit/parser')
| -rwxr-xr-x | spec/unit/parser/collector_spec.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/parser/templatewrapper_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/unit/parser/collector_spec.rb b/spec/unit/parser/collector_spec.rb index 15808d6ff..908cda63a 100755 --- a/spec/unit/parser/collector_spec.rb +++ b/spec/unit/parser/collector_spec.rb @@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' +require 'puppet/rails' require 'puppet/parser/collector' describe Puppet::Parser::Collector, "when initializing" do diff --git a/spec/unit/parser/templatewrapper_spec.rb b/spec/unit/parser/templatewrapper_spec.rb index d4d1d1b8e..68d90a1cc 100755 --- a/spec/unit/parser/templatewrapper_spec.rb +++ b/spec/unit/parser/templatewrapper_spec.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../spec_helper' +require 'puppet/parser/templatewrapper' describe Puppet::Parser::TemplateWrapper do before(:each) do |