1 files changed, 17 insertions, 36 deletions

diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb
index 7feeefb..0fa1358 100644
--- a/spec/defines/augeas_lens_spec.rb
+++ b/spec/defines/augeas_lens_spec.rb
@@ -3,41 +3,20 @@ require 'spec_helper'
 describe 'augeas::lens' do
   let (:title) { 'foo' }
 
-  context 'when not declaring augeas class first' do
-    let (:params) do
-      {
-        :lens_source => '/tmp/foo.aug',
-      }
-    end
-
-    it 'should error' do
-      expect {
-        is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug')
-      }.to raise_error(Puppet::Error, /You must declare the augeas class/)
-    end
-  end
+  lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses'
 
   context 'when declaring augeas class first' do
-
     on_supported_os.each do |os, facts|
       context "on #{os}" do
         let(:facts) do
-          facts.merge({
-            :augeasversion => :undef,
-          })
+          facts
         end
 
         context 'With standard augeas version' do
 
-          let(:pre_condition) do
-            "class { '::augeas': }"
-          end
-
           context 'when no lens_source is passed' do
             it 'should error' do
-              expect {
-                is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug')
-              }.to raise_error(Puppet::Error, /Must pass lens_source/)
+              expect { is_expected.to compile }.to raise_error(/You must set either \$lens_source or \$lens_content/)
             end
           end
 
@@ -48,9 +27,9 @@ describe 'augeas::lens' do
               }
             end
 
-            it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') }
+            it { is_expected.to contain_file("#{lens_dir}/foo.aug") }
             it { is_expected.to contain_exec('Typecheck lens foo') }
-            it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') }
+            it { is_expected.not_to contain_file("#{lens_dir}/tests/test_foo.aug") }
             it { is_expected.not_to contain_exec('Test lens foo') }
           end
 
@@ -62,9 +41,9 @@ describe 'augeas::lens' do
               }
             end
 
-            it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') }
+            it { is_expected.to contain_file("#{lens_dir}/foo.aug") }
+            it { is_expected.to contain_file("#{lens_dir}/tests/test_foo.aug") }
             it { is_expected.to contain_exec('Typecheck lens foo') }
-            it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') }
             it { is_expected.to contain_exec('Test lens foo') }
           end
         end
@@ -77,11 +56,13 @@ describe 'augeas::lens' do
             }
           end
 
-          let(:pre_condition) do
-            "class { '::augeas': version => '1.0.0' }"
+          let(:facts) do
+            super().merge({
+              :augeasversion => '1.0.0',
+            })
           end
 
-          it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') }
+          it { is_expected.to contain_file("#{lens_dir}/foo.aug") }
           it { is_expected.to contain_exec('Typecheck lens foo') }
         end
 
@@ -93,16 +74,16 @@ describe 'augeas::lens' do
             }
           end
 
-          let(:pre_condition) do
-            "class { '::augeas': version => '1.3.0' }"
+          let(:facts) do
+            super().merge({
+              :augeasversion => '1.3.0',
+            })
           end
 
           it do
-            pending "undefined method `negative_failure_message'"
-            is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug')
+            is_expected.not_to contain_file("#{lens_dir}/foo.aug")
           end
           it do
-            pending "undefined method `negative_failure_message'"
             is_expected.not_to contain_exec('Typecheck lens foo')
           end
         end