diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2014-03-18 16:18:53 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-03-18 16:18:53 -0700 |
| commit | aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45 (patch) | |
| tree | 9cefab4ff6e6a33c84482e11e0fae929018303db /spec/unit/puppet/type | |
| parent | 085a0564428d49a027af0fc224fb4019fba54862 (diff) | |
| parent | 904f1a003e790ba2afaf3452ecda9805e87d80d0 (diff) | |
| download | puppet-stdlib-aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45.tar.gz puppet-stdlib-aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45.tar.bz2 | |
Merge branch '3.x' into 4.x
Diffstat (limited to 'spec/unit/puppet/type')
| -rw-r--r-- | spec/unit/puppet/type/anchor_spec.rb | 2 | ||||
| -rw-r--r-- | spec/unit/puppet/type/file_line_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/puppet/type/anchor_spec.rb b/spec/unit/puppet/type/anchor_spec.rb index 2030b83..f92065f 100644 --- a/spec/unit/puppet/type/anchor_spec.rb +++ b/spec/unit/puppet/type/anchor_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require 'puppet' +require 'spec_helper' anchor = Puppet::Type.type(:anchor).new(:name => "ntp::begin") diff --git a/spec/unit/puppet/type/file_line_spec.rb b/spec/unit/puppet/type/file_line_spec.rb index 0cd8a26..37f3861 100644 --- a/spec/unit/puppet/type/file_line_spec.rb +++ b/spec/unit/puppet/type/file_line_spec.rb @@ -1,4 +1,4 @@ -require 'puppet' +require 'spec_helper' require 'tempfile' describe Puppet::Type.type(:file_line) do let :file_line do |