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
5a8eddc7
Commit
5a8eddc7
authored
Sep 27, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update spec
parent
337f5dcf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ee/lib/ee/gitlab/ldap/sync/group.rb
ee/lib/ee/gitlab/ldap/sync/group.rb
+1
-1
spec/ee/spec/lib/ee/gitlab/ldap/sync/group_spec.rb
spec/ee/spec/lib/ee/gitlab/ldap/sync/group_spec.rb
+2
-2
No files found.
ee/lib/ee/gitlab/ldap/sync/group.rb
View file @
5a8eddc7
...
@@ -99,7 +99,7 @@ module EE
...
@@ -99,7 +99,7 @@ module EE
def
dns_for_group_cn
(
group_cn
)
def
dns_for_group_cn
(
group_cn
)
if
config
.
group_base
.
blank?
if
config
.
group_base
.
blank?
logger
.
debug
{
"No `group_base` configured for '
#{
provider
}
' provider and group link CN
#{
group_
link
.
cn
}
. Skipping"
}
logger
.
debug
{
"No `group_base` configured for '
#{
provider
}
' provider and group link CN
#{
group_cn
}
. Skipping"
}
return
nil
return
nil
end
end
...
...
spec/ee/spec/lib/ee/gitlab/ldap/sync/group_spec.rb
View file @
5a8eddc7
...
@@ -419,7 +419,7 @@ describe EE::Gitlab::LDAP::Sync::Group do
...
@@ -419,7 +419,7 @@ describe EE::Gitlab::LDAP::Sync::Group do
it
'adds new members and sets ldap attribute to true'
do
it
'adds new members and sets ldap attribute to true'
do
sync_group
.
update_permissions
sync_group
.
update_permissions
expect
(
group
.
members
.
pluck
(
:user_id
)).
to
include
(
user
.
id
)
expect
(
group
.
users
).
to
include
(
user
)
expect
(
group
.
members
.
find_by
(
user_id:
user
.
id
).
ldap?
).
to
be_truthy
expect
(
group
.
members
.
find_by
(
user_id:
user
.
id
).
ldap?
).
to
be_truthy
end
end
...
@@ -428,7 +428,7 @@ describe EE::Gitlab::LDAP::Sync::Group do
...
@@ -428,7 +428,7 @@ describe EE::Gitlab::LDAP::Sync::Group do
sync_group
.
update_permissions
sync_group
.
update_permissions
expect
(
group
.
members
.
pluck
(
:user_id
)).
to
include
(
user
.
id
)
expect
(
group
.
users
).
to
include
(
user
)
end
end
end
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