From: Mathieu Gagné Date: Mon, 23 Dec 2013 07:27:17 +0000 (-0500) Subject: Remove use of deprecated include_class matcher X-Git-Tag: 3.0.0-rc3~1^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a338d481691c53ff80db7233a1094bf366089036;p=puppet-modules%2Fpuppet-ceilometer.git 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 ac49f26..5fab4c9 100644 --- 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 af7a698..7cf04db 100644 --- 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 e77f139..6d536d7 100644 --- 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 1a6775d..3eecb22 100644 --- 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 3d659f6..dff13d0 100644 --- 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 0da9e1e..777c931 100644 --- 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 421b36d..c89227c 100644 --- 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 0a185dd..793f8b6 100644 --- 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 bf93710..08d62fd 100644 --- 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 6c5f759..f455c86 100644 --- 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(