Merge branch '2.3.x' into 2.4.x

* 2.3.x:
  Make sure functions are loaded for each test
  Use rvalue functions correctly
  (Maint) Don't mock with mocha
  (Maint) Fix up the get_module_path parser function
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines
  Update CHANGELOG, Modulefile for 2.3.3
  fix regression in #11017 properly
  Fix spec tests using the new spec_helper
  Update CHANGELOG for 2.3.2 release
  Make file_line default to ensure => present
  Memoize file_line spec instance variables
  Fix spec tests using the new spec_helper
  Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
  (#13595) initialize_everything_for_tests couples modules Puppet ver

1 files changed, 10 insertions, 7 deletions

diff --git a/spec/unit/puppet/type/file_line_spec.rb b/spec/unit/puppet/type/file_line_spec.rb
index 7e07c06..c86dbd2 100644
--- a/spec/unit/puppet/type/file_line_spec.rb
+++ b/spec/unit/puppet/type/file_line_spec.rb
@@ -1,19 +1,19 @@
 require 'puppet'
 require 'tempfile'
 describe Puppet::Type.type(:file_line) do
-  before :each do
-    @file_line = Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path')
+  let :file_line do
+    Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path')
   end
   it 'should accept a line and path' do
-    @file_line[:line] = 'my_line'
-    @file_line[:line].should == 'my_line'
+    file_line[:line] = 'my_line'
+    file_line[:line].should == 'my_line'
   end
   it 'should accept posix filenames' do
-    @file_line[:path] = '/tmp/path'
-    @file_line[:path].should == '/tmp/path'
+    file_line[:path] = '/tmp/path'
+    file_line[:path].should == '/tmp/path'
   end
   it 'should not accept unqualified path' do
-    expect { @file_line[:path] = 'file' }.should raise_error(Puppet::Error, /File paths must be fully qualified/)
+    expect { file_line[:path] = 'file' }.should raise_error(Puppet::Error, /File paths must be fully qualified/)
   end
   it 'should require that a line is specified' do
     expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => '/tmp/file') }.should raise_error(Puppet::Error, /Both line and path are required attributes/)
@@ -21,4 +21,7 @@ describe Puppet::Type.type(:file_line) do
   it 'should require that a file is specified' do
     expect { Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'path') }.should raise_error(Puppet::Error, /Both line and path are required attributes/)
   end
+  it 'should default to ensure => present' do
+    file_line[:ensure].should eq :present
+  end
 end