kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix error that was causing only one group to be returned and corrected specs to use the proper attribute type

This commit is contained in:
Patricio Cano 2016-04-06 16:03:35 -05:00
parent 7efaf22bcc
commit 3a36fa8957
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gitlab/saml/auth_hash.rb
View File

@ -9,7 +9,9 @@ module Gitlab
private
def get_raw(key)
auth_hash.extra[:raw_info][key]
# Needs to call `all` because of https://github.com/onelogin/ruby-saml/blob/master/lib/onelogin/ruby-saml/attributes.rb#L78
# otherwise just the first value is returned
auth_hash.extra[:raw_info].all[key]
end
end

7
spec/lib/gitlab/saml/user_spec.rb
View File

@ -5,7 +5,7 @@ describe Gitlab::Saml::User, lib: true do
let(:gl_user) { saml_user.gl_user }
let(:uid) { 'my-uid' }
let(:provider) { 'saml' }
let(:auth_hash) { OmniAuth::AuthHash.new(uid: uid, provider: provider, info: info_hash, extra: { raw_info: { groups: %w(Developers Freelancers Designers) } }) }
let(:auth_hash) { OmniAuth::AuthHash.new(uid: uid, provider: provider, info: info_hash, extra: { raw_info: OneLogin::RubySaml::Attributes.new({ 'groups' => %w(Developers Freelancers Designers) }) }) }
let(:info_hash) do
{
name: 'John',
@ -48,6 +48,7 @@ describe Gitlab::Saml::User, lib: true do
before { stub_saml_config({ options: { name: 'saml', groups_attribute: 'groups', external_groups: %w(Freelancers), args: {} } }) }
it 'marks the user as external' do
saml_user.save
expect(gl_user).to be_valid
expect(gl_user.external).to be_truthy
end
end
@ -56,6 +57,7 @@ describe Gitlab::Saml::User, lib: true do
context 'are defined but the user does not belong there' do
it 'does not mark the user as external' do
saml_user.save
expect(gl_user).to be_valid
expect(gl_user.external).to be_falsey
end
end
@ -64,6 +66,7 @@ describe Gitlab::Saml::User, lib: true do
it 'should make user internal' do
existing_user.update_attribute('external', true)
saml_user.save
expect(gl_user).to be_valid
expect(gl_user.external).to be_falsey
end
end
@ -105,6 +108,7 @@ describe Gitlab::Saml::User, lib: true do
before { stub_saml_config({ options: { name: 'saml', groups_attribute: 'groups', external_groups: %w(Freelancers), args: {} } }) }
it 'marks the user as external' do
saml_user.save
expect(gl_user).to be_valid
expect(gl_user.external).to be_truthy
end
end
@ -113,6 +117,7 @@ describe Gitlab::Saml::User, lib: true do
context 'are defined but the user does not belong there' do
it 'does not mark the user as external' do
saml_user.save
expect(gl_user).to be_valid
expect(gl_user.external).to be_falsey
end
end