diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2014-03-18 16:16:00 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-03-18 16:16:00 -0700 |
| commit | 904f1a003e790ba2afaf3452ecda9805e87d80d0 (patch) | |
| tree | 93407d68868c37af5d597d33134ba5a16e919a21 /spec/unit/puppet/type | |
| parent | db00ce660520abfdc110d1ed0dd10bfbc708e256 (diff) | |
| parent | fec943f441f0c6ab8d6b685091d3418ec0e265b4 (diff) | |
| download | puppet-stdlib-904f1a003e790ba2afaf3452ecda9805e87d80d0.tar.gz puppet-stdlib-904f1a003e790ba2afaf3452ecda9805e87d80d0.tar.bz2 | |
Merge branch '3.2.x' into 3.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 |