diff --git a/spec/classes/tuskar_keystone_auth_spec.rb b/spec/classes/tuskar_keystone_auth_spec.rb index bd884c7..0aed833 100644 --- a/spec/classes/tuskar_keystone_auth_spec.rb +++ b/spec/classes/tuskar_keystone_auth_spec.rb @@ -23,7 +23,7 @@ describe 'tuskar::keystone::auth' do it { is_expected.to contain_keystone_user_role('tuskar@foobar').with( :ensure => 'present', - :roles => 'admin' + :roles => ['admin'] )} it { is_expected.to contain_keystone_service('tuskar').with( diff --git a/spec/unit/provider/tuskar_config/ini_setting_spec.rb b/spec/unit/provider/tuskar_config/ini_setting_spec.rb index 56886fc..489f9dc 100644 --- a/spec/unit/provider/tuskar_config/ini_setting_spec.rb +++ b/spec/unit/provider/tuskar_config/ini_setting_spec.rb @@ -22,8 +22,8 @@ describe provider_class do {:name => 'DEFAULT/foo', :value => 'bar'} ) provider = provider_class.new(resource) - provider.section.should == 'DEFAULT' - provider.setting.should == 'foo' + expect(provider.section).to eq('DEFAULT') + expect(provider.setting).to eq('foo') end it 'should allow setting to be set explicitly' do @@ -31,7 +31,7 @@ describe provider_class do {:name => 'dude/foo', :value => 'bar'} ) provider = provider_class.new(resource) - provider.section.should == 'dude' - provider.setting.should == 'foo' + expect(provider.section).to eq('dude') + expect(provider.setting).to eq('foo') end end diff --git a/spec/unit/type/tuskar_config_spec.rb b/spec/unit/type/tuskar_config_spec.rb index 98fa642..a5bf12a 100644 --- a/spec/unit/type/tuskar_config_spec.rb +++ b/spec/unit/type/tuskar_config_spec.rb @@ -29,19 +29,19 @@ describe 'Puppet::Type.type(:tuskar_config)' do it 'should accept a valid value' do @tuskar_config[:value] = 'bar' - @tuskar_config[:value].should == 'bar' + expect(@tuskar_config[:value]).to eq('bar') end it 'should not accept a value with whitespace' do @tuskar_config[:value] = 'b ar' - @tuskar_config[:value].should == 'b ar' + expect(@tuskar_config[:value]).to eq('b ar') end it 'should accept valid ensure values' do @tuskar_config[:ensure] = :present - @tuskar_config[:ensure].should == :present + expect(@tuskar_config[:ensure]).to eq(:present) @tuskar_config[:ensure] = :absent - @tuskar_config[:ensure].should == :absent + expect(@tuskar_config[:ensure]).to eq(:absent) end it 'should not accept invalid ensure values' do