From: Hunter Haugen <hunter@puppet.com>
Date: Mon, 24 Apr 2017 19:02:04 +0000 (-0700)
Subject: (maint) Fix for different versions
X-Git-Tag: 4.0.0~1^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fd1b91171308d23592cb0586f77ae354acf9dea9;p=puppet-modules%2Fpuppetlabs-apt.git

(maint) Fix for different versions
---

diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
index aae4bb0..1dfbf37 100644
--- a/spec/classes/apt_backports_spec.rb
+++ b/spec/classes/apt_backports_spec.rb
@@ -224,7 +224,7 @@ describe 'apt::backports', :type => :class do
       it do
         expect {
           subject.call
-        }.to raise_error(Puppet::Error, /expects a value of type Undef or String/)
+        }.to raise_error(Puppet::Error, /expects a/)
       end
     end
     context 'invalid release' do
@@ -236,7 +236,7 @@ describe 'apt::backports', :type => :class do
       it do
         expect {
           subject.call
-        }.to raise_error(Puppet::Error, /expects a value of type Undef or String/)
+        }.to raise_error(Puppet::Error, /expects a/)
       end
     end
     context 'invalid repos' do
@@ -248,7 +248,7 @@ describe 'apt::backports', :type => :class do
       it do
         expect {
           subject.call
-        }.to raise_error(Puppet::Error, /expects a value of type Undef or String/)
+        }.to raise_error(Puppet::Error, /expects a/)
       end
     end
     context 'invalid key' do
@@ -260,7 +260,7 @@ describe 'apt::backports', :type => :class do
       it do
         expect {
           subject.call
-        }.to raise_error(Puppet::Error, /expects a value of type Undef, String, or Hash, got Boolean/)
+        }.to raise_error(Puppet::Error, /expects a/)
       end
     end
     context 'invalid pin' do
@@ -272,7 +272,7 @@ describe 'apt::backports', :type => :class do
       it do
         expect {
           subject.call
-        }.to raise_error(Puppet::Error, /expects a value of type Undef, Integer, String, or Hash, got Boolean/)
+        }.to raise_error(Puppet::Error, /expects a/)
       end
     end
   end
diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
index 66e9f7f..dab9d16 100644
--- a/spec/defines/key_compat_spec.rb
+++ b/spec/defines/key_compat_spec.rb
@@ -246,7 +246,7 @@ describe 'apt::key', :type => :define do
         :content => [],
       } end
       it 'fails' do
-        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
+        expect { subject.call }.to raise_error(/expects a/)
       end
     end
 
@@ -264,7 +264,7 @@ describe 'apt::key', :type => :define do
         :options => {},
       } end
       it 'fails' do
-        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
+        expect { subject.call }.to raise_error(/expects a/)
       end
     end
 
diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
index 13616d9..334924d 100644
--- a/spec/defines/key_spec.rb
+++ b/spec/defines/key_spec.rb
@@ -251,7 +251,7 @@ describe 'apt::key' do
         :content => [],
       } end
       it 'fails' do
-        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
+        expect { subject.call }.to raise_error(/expects a/)
       end
     end
 
@@ -269,7 +269,7 @@ describe 'apt::key' do
         :options => {},
       } end
       it 'fails' do
-        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
+        expect { subject.call }.to raise_error(/expects a/)
       end
     end