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

16
spec/classes/swift_proxy_swauth_spec.rb
View File

@@ -15,15 +15,15 @@ describe 'swift::proxy::swauth' do
"/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/20_swift_proxy_swauth"
end
it { should contain_package('python-swauth').with_ensure('present') }
it { is_expected.to contain_package('python-swauth').with_ensure('present') }
it { should contain_file(fragment_file).with_content(/[filter:swauth]/) }
it { should contain_file(fragment_file).with_content(/use = egg:swauth#swauth/) }
it { is_expected.to contain_file(fragment_file).with_content(/[filter:swauth]/) }
it { is_expected.to contain_file(fragment_file).with_content(/use = egg:swauth#swauth/) }
describe 'with defaults' do
it { should contain_file(fragment_file).with_content(/default_swift_cluster = local#127\.0\.0\.1/) }
it { should contain_file(fragment_file).with_content(/super_admin_key = swauthkey/) }
it { is_expected.to contain_file(fragment_file).with_content(/default_swift_cluster = local#127\.0\.0\.1/) }
it { is_expected.to contain_file(fragment_file).with_content(/super_admin_key = swauthkey/) }
end
@@ -35,9 +35,9 @@ describe 'swift::proxy::swauth' do
:package_ensure => 'latest' }
end
it { should contain_file(fragment_file).with_content(/default_swift_cluster = local#10\.0\.0\.1/) }
it { should contain_file(fragment_file).with_content(/super_admin_key = foo/) }
it { should contain_package('python-swauth').with_ensure('latest') }
it { is_expected.to contain_file(fragment_file).with_content(/default_swift_cluster = local#10\.0\.0\.1/) }
it { is_expected.to contain_file(fragment_file).with_content(/super_admin_key = foo/) }
it { is_expected.to contain_package('python-swauth').with_ensure('latest') }
end