1 files changed, 11 insertions, 12 deletions
diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb
index 21dfd55..f4e5be7 100644
--- a/spec/defines/augeas_lens_spec.rb
+++ b/spec/defines/augeas_lens_spec.rb
@@ -11,12 +11,12 @@ describe 'augeas::lens' do
     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/)
+      expect { is_expected.to compile }.to raise_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|
@@ -24,6 +24,7 @@ describe 'augeas::lens' do
         let(:facts) do
           facts.merge({
             :augeasversion => :undef,
+            :puppetversion => Puppet.version,
           })
         end
 
@@ -35,9 +36,7 @@ describe 'augeas::lens' do
 
           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, /You must set either \$lens_source or \$lens_content/)
+              expect { is_expected.to compile }.to raise_error(/You must set either \$lens_source or \$lens_content/)
             end
           end
 
@@ -48,9 +47,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 +61,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
@@ -81,7 +80,7 @@ describe 'augeas::lens' do
             "class { '::augeas': version => '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
 
@@ -99,7 +98,7 @@ describe 'augeas::lens' do
 
           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'"