replace rspec include_class matcher with contain_class

To fix this warning with rspec-puppet >= 1.0.0: DEPRECATION: include_class is deprecated. Use contain_class instead
jhoblitt · Apr 8, 2014 · 30bd33d · 30bd33d
1 parent 0795ca3
commit 30bd33d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/spec/classes/config_ldap_spec.rb b/spec/classes/config_ldap_spec.rb
@@ -24,7 +24,7 @@
     let(:params) { params }
 
     it do
-      should include_class('pureftpd::config::ldap') 
+      should contain_class('pureftpd::config::ldap') 
       should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
         .with_ensure('file') \
         .with_content(content)
@@ -65,7 +65,7 @@
     let(:params) {{ :foo => 'bar' }}
 
     it 'should fail' do
-      expect { should include_class('pureftpd::config::ldap') }.
+      expect { should contain_class('pureftpd::config::ldap') }.
         to raise_error(Puppet::Error, /Invalid parameter foo/)
     end
   end

diff --git a/spec/classes/config_mysql_spec.rb b/spec/classes/config_mysql_spec.rb
@@ -31,7 +31,7 @@
     let(:params) { params }
 
     it do
-      should include_class('pureftpd::config::mysql') 
+      should contain_class('pureftpd::config::mysql') 
       should contain_file('/etc/pure-ftpd/pureftpd-mysql.conf') \
         .with_ensure('file') \
         .with_content(content)
@@ -72,7 +72,7 @@
     let(:params) {{ :foo => 'bar' }}
 
     it 'should fail' do
-      expect { should include_class('pureftpd::config::mysql') }.
+      expect { should contain_class('pureftpd::config::mysql') }.
         to raise_error(Puppet::Error, /Invalid parameter foo/)
     end
   end

diff --git a/spec/classes/config_pgsql_spec.rb b/spec/classes/config_pgsql_spec.rb
@@ -28,7 +28,7 @@
     let(:params) { params }
 
     it do
-      should include_class('pureftpd::config::pgsql') 
+      should contain_class('pureftpd::config::pgsql') 
       should contain_file('/etc/pure-ftpd/pureftpd-pgsql.conf') \
         .with_ensure('file') \
         .with_content(content)
@@ -69,7 +69,7 @@
     let(:params) {{ :foo => 'bar' }}
 
     it 'should fail' do
-      expect { should include_class('pureftpd::config::pgsql') }.
+      expect { should contain_class('pureftpd::config::pgsql') }.
         to raise_error(Puppet::Error, /Invalid parameter foo/)
     end
   end

diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -72,7 +72,7 @@
     let(:params) { params }
 
     it do
-      should include_class('pureftpd::config') 
+      should contain_class('pureftpd::config') 
       should contain_file('/etc/pure-ftpd/pure-ftpd.conf') \
         .with_ensure('file') \
         .with_content(content)
@@ -113,7 +113,7 @@
     let(:params) {{ :foo => 'bar' }}
 
     it 'should fail' do
-      expect { should include_class('pureftpd::config') }.
+      expect { should contain_class('pureftpd::config') }.
         to raise_error(Puppet::Error, /Invalid parameter foo/)
     end
   end

diff --git a/spec/classes/install_spec.rb b/spec/classes/install_spec.rb
@@ -5,23 +5,23 @@
     let(:facts) {{ :osfamily => 'RedHat' }}
 
     describe 'no params' do
-      it { should include_class('pureftpd::install') }
+      it { should contain_class('pureftpd::install') }
       it { should contain_package('pure-ftpd').with_ensure('present') }
       it { should_not contain_package('pure-ftpd-selinux').with_ensure('present') }
     end
 
     describe 'use_selinux = false' do
       let(:params) {{ :use_selinux => false }}
 
-      it { should include_class('pureftpd::install') }
+      it { should contain_class('pureftpd::install') }
       it { should contain_package('pure-ftpd').with_ensure('present') }
       it { should_not contain_package('pure-ftpd-selinux').with_ensure('present') }
     end
 
     describe 'use_selinux = true' do
       let(:params) {{ :use_selinux => true }}
 
-      it { should include_class('pureftpd::install') }
+      it { should contain_class('pureftpd::install') }
       it { should contain_package('pure-ftpd').with_ensure('present') }
       it { should contain_package('pure-ftpd-selinux').with_ensure('present') }
     end
@@ -30,7 +30,7 @@
       let(:params) {{ :use_selinux => 'foo' }}
 
       it 'should fail' do
-        expect { should include_class('pureftpd::install') }.
+        expect { should contain_class('pureftpd::install') }.
           to raise_error(Puppet::Error, /not a boolean/)
       end
     end

diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
@@ -4,7 +4,7 @@
   describe 'for osfamily RedHat' do
     let(:facts) {{ :osfamily => 'RedHat' }}
 
-    it { should include_class('pureftpd::params') }
+    it { should contain_class('pureftpd::params') }
   end
 
   describe 'unsupported osfamily' do
@@ -16,7 +16,7 @@
     end
 
     it 'should fail' do
-      expect { should include_class('pureftpd::params') }.
+      expect { should contain_class('pureftpd::params') }.
         to raise_error(Puppet::Error, /not supported on Debian/)
     end
   end

diff --git a/spec/classes/pureftpd_spec.rb b/spec/classes/pureftpd_spec.rb
@@ -4,7 +4,7 @@
   let(:facts) { {:osfamily=> 'RedHat'} }
 
   describe 'with no params' do
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install') }
     it do
       should contain_class('pureftpd::config').
@@ -19,7 +19,7 @@
   describe 'with $use_selinux => true' do
     let(:params) {{ :use_selinux => true }}
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install').with_use_selinux(true) }
     it do
       should contain_class('pureftpd::config').
@@ -34,7 +34,7 @@
   describe 'with $use_selinux => false' do
     let(:params) {{ :use_selinux => false }}
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install').with_use_selinux(false) }
     it do
       should contain_class('pureftpd::config').
@@ -51,15 +51,15 @@
 
     it 'should fail' do
       expect {
-        should include_class('pureftpd') 
+        should contain_class('pureftpd') 
       }.to raise_error(Puppet::Error, /is not a boolean/)
     end
   end
 
   describe 'with $config => {}' do
     let(:params) {{ :config => {} }}
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install') }
     it do
       should contain_class('pureftpd::config').
@@ -79,7 +79,7 @@
       }
     }}
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install') }
     it do
       should contain_class('pureftpd::config').
@@ -100,7 +100,7 @@
 
     it 'should fail' do
       expect {
-        should include_class('pureftpd') 
+        should contain_class('pureftpd') 
       }.to raise_error(Puppet::Error, /is not a Hash/)
     end
   end
@@ -115,7 +115,7 @@
       }
     end
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install') }
     it do
       should contain_class('pureftpd::config').
@@ -139,7 +139,7 @@
 
     it 'should fail' do
       expect {
-        should include_class('pureftpd') 
+        should contain_class('pureftpd') 
       }.to raise_error(Puppet::Error, /is not a Hash/)
     end
   end
@@ -154,7 +154,7 @@
       }
     end
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install') }
     it do
       should contain_class('pureftpd::config').
@@ -178,7 +178,7 @@
 
     it 'should fail' do
       expect {
-        should include_class('pureftpd') 
+        should contain_class('pureftpd') 
       }.to raise_error(Puppet::Error, /is not a Hash/)
     end
   end
@@ -193,7 +193,7 @@
       }
     end
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install') }
     it do
       should contain_class('pureftpd::config').
@@ -217,7 +217,7 @@
 
     it 'should fail' do
       expect {
-        should include_class('pureftpd') 
+        should contain_class('pureftpd') 
       }.to raise_error(Puppet::Error, /is not a Hash/)
     end
   end
@@ -241,7 +241,7 @@
       }
     end
 
-    it { should include_class('pureftpd') }
+    it { should contain_class('pureftpd') }
     it { should contain_class('pureftpd::install') }
     it do
       should contain_class('pureftpd::config').