openstack/puppet-swift
Code Issues Proposed changes

spec: updates for rspec-puppet 2.x and rspec 3.x

Browse Source 
This patch aim to update our specs test in order to work with the
rspec-puppet release 2.0.0, in the mean time, we update rspec syntax
in order to be prepared for rspec 3.x move.

In details:
  * Use shared_examples "a Puppet::Error" for puppet::error tests
  * Convert 'should' keyword to 'is_expected.to' (prepare rspec 3.x)
  * Fix spec tests for rspec-puppet 2.0.0
  * Upgrade and pin rspec-puppet from 1.0.1 to 2.0.0
  * Clean Gemfile (remove over-specificication of runtime deps of puppetlabs_spec_helper)
  * Remove un-used puppet-lint (name_containing_dash config)

Change-Id: I5488507176d4665895eef65ddb4b6f0fb4eda3e7
Card: https://trello.com/c/eHXc1Ryd/4-investigate-the-necessary-change-to-be-rspec-puppet-2-0-0-compliant
This commit is contained in:
Sebastien Badia
2015-03-23 18:23:07 +01:00
parent 77be0932fc
commit f4cfe8e8e4
49 changed files with 304 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spec/classes/swift_ringbuilder_spec.rb
View File

@@ -10,7 +10,7 @@ describe 'swift::ringbuilder' do
end
describe 'when swift class is not included' do
it 'should fail' do
expect { subject }.to raise_error(Puppet::Error)
expect { catalogue }.to raise_error(Puppet::Error)
end
end
describe 'when swift class is included' do
@@ -21,14 +21,14 @@ describe 'swift::ringbuilder' do
end
it 'should rebalance the ring for all ring types' do
should contain_swift__ringbuilder__rebalance('object')
should contain_swift__ringbuilder__rebalance('account')
should contain_swift__ringbuilder__rebalance('container')
is_expected.to contain_swift__ringbuilder__rebalance('object')
is_expected.to contain_swift__ringbuilder__rebalance('account')
is_expected.to contain_swift__ringbuilder__rebalance('container')
end
describe 'with default parameters' do
['object', 'account', 'container'].each do |type|
it { should contain_swift__ringbuilder__create(type).with(
it { is_expected.to contain_swift__ringbuilder__create(type).with(
:part_power => '18',
:replicas => '3',
:min_part_hours => '24'
@@ -46,7 +46,7 @@ describe 'swift::ringbuilder' do
end
['object', 'account', 'container'].each do |type|
it { should contain_swift__ringbuilder__create(type).with(
it { is_expected.to contain_swift__ringbuilder__create(type).with(
:part_power => '19',
:replicas => '3',
:min_part_hours => '2'
@@ -75,22 +75,22 @@ describe 'swift::ringbuilder' do
end
it 'should set up all of the correct dependencies' do
should contain_swift__ringbuilder__create('object').with(
is_expected.to contain_swift__ringbuilder__create('object').with(
{:before => 'Ring_object_device[127.0.0.1:6000/1]'}
)
should contain_swift__ringbuilder__create('container').with(
is_expected.to contain_swift__ringbuilder__create('container').with(
{:before => 'Ring_container_device[127.0.0.1:6001/1]'}
)
should contain_swift__ringbuilder__create('account').with(
is_expected.to contain_swift__ringbuilder__create('account').with(
{:before => 'Ring_account_device[127.0.0.1:6002/1]'}
)
should contain_ring_object_device('127.0.0.1:6000/1').with(
is_expected.to contain_ring_object_device('127.0.0.1:6000/1').with(
{:notify => 'Swift::Ringbuilder::Rebalance[object]'}
)
should contain_ring_container_device('127.0.0.1:6001/1').with(
is_expected.to contain_ring_container_device('127.0.0.1:6001/1').with(
{:notify => 'Swift::Ringbuilder::Rebalance[container]'}
)
should contain_ring_account_device('127.0.0.1:6002/1').with(
is_expected.to contain_ring_account_device('127.0.0.1:6002/1').with(
{:notify => 'Swift::Ringbuilder::Rebalance[account]'}
)
end