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

Fix a too strict array-matching expectation

Browse source 
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2018-02-13 18:20:01 +01:00
parent e7595c10bc
commit 539b3a3532
No known key found for this signature in database
GPG key ID: 46DF07E5CD9E96AB
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
spec/requests/openid_connect_spec.rb
View file

@ -81,7 +81,7 @@ describe 'OpenID Connect requests' do
it 'includes all user information and group memberships' do it 'includes all user information and group memberships' do
request_user_info request_user_info
expect(json_response).to eq({ expect(json_response).to match(a_hash_including({
'sub' => hashed_subject, 'sub' => hashed_subject,
'name' => 'Alice', 'name' => 'Alice',
'nickname' => 'alice', 'nickname' => 'alice',
@ -90,13 +90,12 @@ describe 'OpenID Connect requests' do
'website' => 'https://example.com', 'website' => 'https://example.com',
'profile' => 'http://localhost/alice', 'profile' => 'http://localhost/alice',
'picture' => "http://localhost/uploads/-/system/user/avatar/#{user.id}/dk.png", 'picture' => "http://localhost/uploads/-/system/user/avatar/#{user.id}/dk.png",
'groups' => 'groups' => anything
if Group.supports_nested_groups? }))
['group1', 'group2/group3', 'group2/group3/group4']
else expected_groups = %w[group1 group2/group3]
['group1', 'group2/group3'] expected_groups << 'group2/group3/group4' if Group.supports_nested_groups?
end expect(json_response['groups']).to match_array(expected_groups)
})
end end
end end