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
a044bccb
Commit
a044bccb
authored
Mar 18, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor code and specs
parent
56813c7f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
4 deletions
+8
-4
ee/app/controllers/groups/saml_providers_controller.rb
ee/app/controllers/groups/saml_providers_controller.rb
+0
-2
ee/app/models/scim_oauth_access_token.rb
ee/app/models/scim_oauth_access_token.rb
+1
-1
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
+2
-0
ee/spec/factories/scim_oauth_access_tokens.rb
ee/spec/factories/scim_oauth_access_tokens.rb
+1
-1
ee/spec/models/scim_oauth_access_token_spec.rb
ee/spec/models/scim_oauth_access_token_spec.rb
+2
-0
ee/spec/serializers/scim_oauth_access_token_entity_spec.rb
ee/spec/serializers/scim_oauth_access_token_entity_spec.rb
+2
-0
No files found.
ee/app/controllers/groups/saml_providers_controller.rb
View file @
a044bccb
...
...
@@ -8,7 +8,6 @@ class Groups::SamlProvidersController < Groups::ApplicationController
before_action
:check_group_saml_available!
before_action
:check_group_saml_configured
# rubocop: disable CodeReuse/ActiveRecord
def
show
@saml_provider
=
@group
.
saml_provider
||
@group
.
build_saml_provider
...
...
@@ -16,7 +15,6 @@ class Groups::SamlProvidersController < Groups::ApplicationController
@scim_token_url
=
scim_token
.
as_entity_json
[
:scim_api_url
]
if
scim_token
end
# rubocop: enable CodeReuse/ActiveRecord
def
create
@saml_provider
=
@group
.
build_saml_provider
(
saml_provider_params
)
...
...
ee/app/models/scim_oauth_access_token.rb
View file @
a044bccb
...
...
@@ -5,7 +5,7 @@ class ScimOauthAccessToken < ApplicationRecord
belongs_to
:group
add_authentication_token_field
:token
add_authentication_token_field
:token
,
encrypted: :required
validates
:group
,
presence:
true
before_save
:ensure_token
...
...
ee/spec/controllers/groups/scim_oauth_controller_spec.rb
View file @
a044bccb
# frozen_string_literal: true
require
'spec_helper'
describe
Groups
::
ScimOauthController
do
...
...
ee/spec/factories/scim_oauth_access_tokens.rb
View file @
a044bccb
#
Read about factories at https://github.com/thoughtbot/factory_bot
#
frozen_string_literal: true
FactoryBot
.
define
do
factory
:scim_oauth_access_token
do
...
...
ee/spec/models/scim_oauth_access_token_spec.rb
View file @
a044bccb
# frozen_string_literal: true
require
'spec_helper'
describe
ScimOauthAccessToken
do
...
...
ee/spec/serializers/scim_oauth_access_token_entity_spec.rb
View file @
a044bccb
# frozen_string_literal: true
require
'spec_helper'
describe
ScimOauthAccessTokenEntity
do
...
...
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