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
95167417
Commit
95167417
authored
Mar 14, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
parent
aa2952ec
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
5 additions
and
5 deletions
+5
-5
ee/lib/ee/gitlab/scim/users.rb
ee/lib/ee/gitlab/scim/users.rb
+1
-1
ee/spec/lib/ee/gitlab/scim/emails_spec.rb
ee/spec/lib/ee/gitlab/scim/emails_spec.rb
+0
-0
ee/spec/lib/ee/gitlab/scim/error_spec.rb
ee/spec/lib/ee/gitlab/scim/error_spec.rb
+0
-0
ee/spec/lib/ee/gitlab/scim/not_found_spec.rb
ee/spec/lib/ee/gitlab/scim/not_found_spec.rb
+0
-0
ee/spec/lib/ee/gitlab/scim/params_parser_spec.rb
ee/spec/lib/ee/gitlab/scim/params_parser_spec.rb
+4
-4
ee/spec/lib/ee/gitlab/scim/user_spec.rb
ee/spec/lib/ee/gitlab/scim/user_spec.rb
+0
-0
ee/spec/lib/ee/gitlab/scim/users_spec.rb
ee/spec/lib/ee/gitlab/scim/users_spec.rb
+0
-0
No files found.
ee/lib/ee/gitlab/scim/users.rb
View file @
95167417
...
...
@@ -9,7 +9,7 @@ module EE
expose
:items_per_page
,
as: :itemsPerPage
expose
:start_index
,
as: :startIndex
expose
:resources
,
as: :Resources
,
using:
::
EE
::
Gitlab
::
Scim
::
User
#, if: ->(identity, _) { identity.present? }
expose
:resources
,
as: :Resources
,
using:
::
EE
::
Gitlab
::
Scim
::
User
private
...
...
ee/spec/lib/gitlab/scim/emails_spec.rb
→
ee/spec/lib/
ee/
gitlab/scim/emails_spec.rb
View file @
95167417
File moved
ee/spec/lib/gitlab/scim/error_spec.rb
→
ee/spec/lib/
ee/
gitlab/scim/error_spec.rb
View file @
95167417
File moved
ee/spec/lib/gitlab/scim/not_found_spec.rb
→
ee/spec/lib/
ee/
gitlab/scim/not_found_spec.rb
View file @
95167417
File moved
ee/spec/lib/gitlab/scim/params_parser_spec.rb
→
ee/spec/lib/
ee/
gitlab/scim/params_parser_spec.rb
View file @
95167417
...
...
@@ -19,13 +19,13 @@ describe EE::Gitlab::Scim::ParamsParser do
it
'returns the correct operation attributes'
do
operations
=
[{
"op"
:
"Replace"
,
"path"
:
"active"
,
"value"
:
"False"
}]
expect
(
described_class
.
new
(
o
perations:
operations
).
to_hash
).
to
eq
(
active:
false
)
expect
(
described_class
.
new
(
O
perations
:
operations
).
to_hash
).
to
eq
(
active:
false
)
end
it
'returns an empty hash for the wrong operations'
do
operations
=
[{
"op"
:
"Replace"
,
"path"
:
"test"
,
"value"
:
"False"
}]
expect
(
described_class
.
new
(
o
perations:
operations
).
to_hash
).
to
eq
({})
expect
(
described_class
.
new
(
O
perations
:
operations
).
to_hash
).
to
eq
({})
end
end
...
...
@@ -33,13 +33,13 @@ describe EE::Gitlab::Scim::ParamsParser do
it
'returns true when deprovisioning'
do
operations
=
[{
"op"
:
"Replace"
,
"path"
:
"active"
,
"value"
:
"False"
}]
expect
(
described_class
.
new
(
o
perations:
operations
).
deprovision_user?
).
to
be
true
expect
(
described_class
.
new
(
O
perations
:
operations
).
deprovision_user?
).
to
be
true
end
it
'returns false when not deprovisioning'
do
operations
=
[{
"op"
:
"Replace"
,
"path"
:
"active"
,
"value"
:
"True"
}]
expect
(
described_class
.
new
(
o
perations:
operations
).
deprovision_user?
).
to
be
false
expect
(
described_class
.
new
(
O
perations
:
operations
).
deprovision_user?
).
to
be
false
end
end
end
ee/spec/lib/gitlab/scim/user_spec.rb
→
ee/spec/lib/
ee/
gitlab/scim/user_spec.rb
View file @
95167417
File moved
ee/spec/lib/gitlab/scim/users_spec.rb
→
ee/spec/lib/
ee/
gitlab/scim/users_spec.rb
View file @
95167417
File moved
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