diff options
| author | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
|---|---|---|
| committer | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
| commit | 88b4b9bd2e8224e17ff089d2a8ea99f800686b70 (patch) | |
| tree | 67e6fadf31d75860f2158c05168f160d52ae46fe /spec/requests/openid_connect_spec.rb | |
| parent | 750fd7374ae67bb6ed4d9d875052bbc6d86d9b31 (diff) | |
| parent | 77926ea02512d836c61a30e3986902e2d8e7f886 (diff) | |
| download | gitlab-ce-docs-troubleshoot-scim.tar.gz | |
Merge branch 'master' into 'docs-troubleshoot-scim'docs-troubleshoot-scim
# Conflicts:
# doc/user/group/saml_sso/scim_setup.md
Diffstat (limited to 'spec/requests/openid_connect_spec.rb')
| -rw-r--r-- | spec/requests/openid_connect_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/openid_connect_spec.rb b/spec/requests/openid_connect_spec.rb index 86e41cbdf00..025568d8bea 100644 --- a/spec/requests/openid_connect_spec.rb +++ b/spec/requests/openid_connect_spec.rb @@ -104,7 +104,7 @@ describe 'OpenID Connect requests' do expect(json_response).to match(id_token_claims.merge(user_info_claims)) expected_groups = [group1.full_path, group3.full_path] - expected_groups << group4.full_path if Group.supports_nested_objects? + expected_groups << group4.full_path expect(json_response['groups']).to match_array(expected_groups) end |