Merge "Fix spec tests for RSpec 3.x and Puppet 4.x"
This commit is contained in:
@@ -15,7 +15,7 @@ describe 'glance::keystone::auth' do
|
||||
|
||||
it { is_expected.to contain_keystone_user_role('glance@services').with(
|
||||
:ensure => 'present',
|
||||
:roles => 'admin'
|
||||
:roles => ['admin']
|
||||
) }
|
||||
|
||||
it { is_expected.to contain_keystone_service('glance').with(
|
||||
@@ -50,7 +50,7 @@ describe 'glance::keystone::auth' do
|
||||
|
||||
it { is_expected.to contain_keystone_user_role('glancey@services').with(
|
||||
:ensure => 'present',
|
||||
:roles => 'admin'
|
||||
:roles => ['admin']
|
||||
) }
|
||||
|
||||
it { is_expected.to contain_keystone_service('glancey').with(
|
||||
@@ -153,7 +153,7 @@ describe 'glance::keystone::auth' do
|
||||
}
|
||||
end
|
||||
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/glance').with_notify('Service[glance-api]') }
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/glance').with_notify(["Service[glance-api]"]) }
|
||||
end
|
||||
|
||||
describe 'when overriding service name' do
|
||||
|
@@ -83,7 +83,7 @@ describe 'glance::registry' do
|
||||
'refreshonly' => true,
|
||||
'logoutput' => 'on_failure',
|
||||
'subscribe' => ['Package[glance-registry]', 'File[/etc/glance/glance-registry.conf]'],
|
||||
'notify' => 'Service[glance-registry]'
|
||||
'notify' => ["Service[glance-registry]"]
|
||||
)
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user