Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f0878ee8
Commit
f0878ee8
authored
Mar 21, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failure
parent
266db39e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
ee/app/serializers/scim_oauth_access_token_entity.rb
ee/app/serializers/scim_oauth_access_token_entity.rb
+5
-1
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
+1
-1
No files found.
ee/app/serializers/scim_oauth_access_token_entity.rb
View file @
f0878ee8
# frozen_string_literal: true
class
ScimOauthAccessTokenEntity
<
Grape
::
Entity
include
::
API
::
Helpers
::
RelatedResourcesHelpers
SCIM_PATH
=
'/api/scim/v2/groups'
expose
:scim_api_url
do
|
scim
|
Gitlab
::
Routing
.
url_helpers
.
group_scim_oauth_url
(
scim
.
group
)
expose_url
(
"
#{
SCIM_PATH
}
/
#{
scim
.
group
.
full_path
}
"
)
end
expose
:token
,
as: :scim_token
...
...
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
View file @
f0878ee8
...
...
@@ -77,7 +77,7 @@ describe Groups::ScimOauthController do
end
it
'shows the url'
do
expect
(
json_response
[
'scim_api_url'
]).
to
eq
(
"http://localhost/
groups/
#{
group
.
full_path
}
/-/scim_oauth
"
)
expect
(
json_response
[
'scim_api_url'
]).
to
eq
(
"http://localhost/
api/scim/v2/groups/
#{
group
.
full_path
}
"
)
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment