(maint) Unit test fixes

diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
index c0d54a21c990e5e2f18d4e7326ad45254b6a472a..aae4bb0cc150d3c5c977d427c4e1573ed13a525c 100644 (file)
--- 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 String value/)
+        }.to raise_error(Puppet::Error, /expects a value of type Undef or String/)
       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 String value/)
+        }.to raise_error(Puppet::Error, /expects a value of type Undef or String/)
       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 String value/)
+        }.to raise_error(Puppet::Error, /expects a value of type Undef or String/)
       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 String or Hash, got Boolean/)
+        }.to raise_error(Puppet::Error, /expects a value of type Undef, String, or Hash, got Boolean/)
       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 Integer, String, or Hash, got Boolean/)
+        }.to raise_error(Puppet::Error, /expects a value of type Undef, Integer, String, or Hash, got Boolean/)
       end
     end
   end

diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
index f6013d35ba5931ccb1f292b1185a51ff04f80990..66e9f7fe90713b179dae0cac9b15ea54cc797c5d 100644 (file)
--- 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 String value/)
+        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
       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 String value/)
+        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
       end
     end
 

diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
index 1f878c3e8c65fafc5f78200e1c93da282bed0e2d..13616d97acc14f73c8d6dd84c5fb6b2402fb39a6 100644 (file)
--- 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 String value/)
+        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
       end
     end
 
@@ -269,7 +269,7 @@ describe 'apt::key' do
         :options => {},
       } end
       it 'fails' do
-        expect { subject.call }.to raise_error(/expects a String value/)
+        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
       end
     end