Remove use of deprecated include_class matcher

include_class is deprecated since rspec-puppet 1.0.0.
contain_class should be used instead.

Closes-bug: #1263617
Change-Id: If2e5a2c467a5d1c4eb130dc6b2643d05c748abe0
(cherry picked from commit f745cf634fa2cf9889a2ef03ee9de3a3d0d1045b)

diff --git a/spec/classes/ceilometer_agent_central_spec.rb b/spec/classes/ceilometer_agent_central_spec.rb
index ac49f2687ee13267ebc848b6a4bbbbeb151b165d..5fab4c924e75177c2172e170143d90a88bbb1ccc 100644 (file)
--- a/spec/classes/ceilometer_agent_central_spec.rb
+++ b/spec/classes/ceilometer_agent_central_spec.rb
@@ -12,7 +12,7 @@ describe 'ceilometer::agent::central' do
 
   shared_examples_for 'ceilometer-agent-central' do
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-agent-central package' do
       should contain_package('ceilometer-agent-central').with(

diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb
index af7a6981fbc7b265105c661e53c10c71ca29c321..7cf04dbbd54166e2f7e5bc5a49d9f0c2720c0cec 100644 (file)
--- a/spec/classes/ceilometer_agent_compute_spec.rb
+++ b/spec/classes/ceilometer_agent_compute_spec.rb
@@ -14,7 +14,7 @@ describe 'ceilometer::agent::compute' do
 
   shared_examples_for 'ceilometer-agent-compute' do
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-agent-compute package' do
       should contain_package('ceilometer-agent-compute').with(

diff --git a/spec/classes/ceilometer_alarm_evaluator_spec.rb b/spec/classes/ceilometer_alarm_evaluator_spec.rb
index e77f139f0aa1bf2d00f40602940dbc6c72330f36..6d536d72424a06db106fcc3cbad6f146d972242a 100644 (file)
--- a/spec/classes/ceilometer_alarm_evaluator_spec.rb
+++ b/spec/classes/ceilometer_alarm_evaluator_spec.rb
@@ -16,7 +16,7 @@ describe 'ceilometer::alarm::evaluator' do
   end
 
   shared_examples_for 'ceilometer-alarm-evaluator' do
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-alarm package' do
       should contain_package('ceilometer-alarm').with(

diff --git a/spec/classes/ceilometer_alarm_notifier_spec.rb b/spec/classes/ceilometer_alarm_notifier_spec.rb
index 1a6775d02d3131701d862af03c149a2f57f0173b..3eecb2287556c949844e87a22701a1bb2fb21eb6 100644 (file)
--- a/spec/classes/ceilometer_alarm_notifier_spec.rb
+++ b/spec/classes/ceilometer_alarm_notifier_spec.rb
@@ -17,7 +17,7 @@ describe 'ceilometer::alarm::notifier' do
   end
 
   shared_examples_for 'ceilometer-alarm-notifier' do
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-alarm package' do
       should contain_package('ceilometer-alarm').with(

diff --git a/spec/classes/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
index 3d659f6c5de242f52a7dcd77758cc0ad2acb2df3..dff13d0d301135ccabe57a18bd394035ed57ea4c 100644 (file)
--- a/spec/classes/ceilometer_api_spec.rb
+++ b/spec/classes/ceilometer_api_spec.rb
@@ -24,7 +24,7 @@ describe 'ceilometer::api' do
       it { expect { should raise_error(Puppet::Error) } }
     end
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-api package' do
       should contain_package('ceilometer-api').with(

diff --git a/spec/classes/ceilometer_client_spec.rb b/spec/classes/ceilometer_client_spec.rb
index 0da9e1eca96b8b03110363f179635658aa514e93..777c931e9302f8417b0542a1f450212b255eafc8 100644 (file)
--- a/spec/classes/ceilometer_client_spec.rb
+++ b/spec/classes/ceilometer_client_spec.rb
@@ -4,7 +4,7 @@ describe 'ceilometer::client' do
 
   shared_examples_for 'ceilometer client' do
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer client package' do
       should contain_package('python-ceilometerclient').with(

diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
index 421b36deac5cb69fdfb04ec38eb4a5a066d03d14..c89227c3db43e953bc4b98155ec0f410873a22fb 100644 (file)
--- a/spec/classes/ceilometer_collector_spec.rb
+++ b/spec/classes/ceilometer_collector_spec.rb
@@ -8,7 +8,7 @@ describe 'ceilometer::collector' do
 
   shared_examples_for 'ceilometer-collector' do
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-collector package' do
       should contain_package('ceilometer-collector').with(

diff --git a/spec/classes/ceilometer_db_spec.rb b/spec/classes/ceilometer_db_spec.rb
index 0a185ddcefd08cc10284e203ed6b8319d8a578bc..793f8b647fae8b45c2b26b35c3cd1c6c64ac359b 100644 (file)
--- a/spec/classes/ceilometer_db_spec.rb
+++ b/spec/classes/ceilometer_db_spec.rb
@@ -12,7 +12,7 @@ describe 'ceilometer::db' do
       { :database_connection => 'mongodb://localhost:1234/ceilometer' }
     end
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs python-mongodb package' do
       should contain_package('ceilometer-backend-package').with(
@@ -35,7 +35,7 @@ describe 'ceilometer::db' do
       { :database_connection => 'mongodb://localhost:1234/ceilometer' }
     end
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs pymongo package' do
       should contain_package('ceilometer-backend-package').with(
@@ -58,7 +58,7 @@ describe 'ceilometer::db' do
       { :database_connection => 'mongodb://localhost:1234/ceilometer' }
     end
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs pymongo package' do
       should contain_package('ceilometer-backend-package').with(
@@ -80,7 +80,7 @@ describe 'ceilometer::db' do
       { :database_connection => 'sqlite:///var/lib/ceilometer.db' }
     end
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs pymongo package' do
       should contain_package('ceilometer-backend-package').with(
@@ -100,7 +100,7 @@ describe 'ceilometer::db' do
       { :database_connection => 'sqlite:///var/lib/ceilometer.db' }
     end
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs python-mongodb package' do
       should contain_package('ceilometer-backend-package').with(

diff --git a/spec/classes/ceilometer_expirer_spec.rb b/spec/classes/ceilometer_expirer_spec.rb
index bf937102875f518988fedc3712981e0f264393d9..08d62fd38c628f4f1cc5ea5f9301a37e6eab41c5 100644 (file)
--- a/spec/classes/ceilometer_expirer_spec.rb
+++ b/spec/classes/ceilometer_expirer_spec.rb
@@ -32,7 +32,7 @@ describe 'ceilometer::expirer' do
 
   shared_examples_for 'ceilometer-expirer' do
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer common package' do
       should contain_package('ceilometer-common').with(

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 6c5f75934bb834b4cb6b596a71241f0748bd8fd0..f455c868879f2e2fa92fb91ac8def35b30b393ec 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -63,7 +63,7 @@ describe 'ceilometer' do
 
   shared_examples_for 'a ceilometer base installation' do
 
-    it { should include_class('ceilometer::params') }
+    it { should contain_class('ceilometer::params') }
 
     it 'configures ceilometer group' do
       should contain_group('ceilometer').with(