Skip to content

Commit 7014299

Browse files
mtoddmtodd
committed
Update membership validator tests
1 parent db13ebd commit 7014299

File tree

2 files changed

+23
-100
lines changed

2 files changed

+23
-100
lines changed

‎test/membership_validators/classic_test.rb

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
require_relative '../test_helper'
22

33
class GitHubLdapClassicMembershipValidatorsTest < GitHub::Ldap::Test
4-
def self.test_server_options
5-
{ search_domains: "dc=github,dc=com",
6-
user_fixtures: FIXTURES.join('github-with-subgroups.ldif').to_s
7-
}
8-
end
9-
104
def setup
11-
@ldap = GitHub::Ldap.new(options)
5+
@ldap = GitHub::Ldap.new(options.merge(search_domains: %w(dc=github,dc=com)))
126
@domain = @ldap.domain("dc=github,dc=com")
13-
@entry = @domain.user?('user1.1.1.1')
7+
@entry = @domain.user?('user1')
148
@validator = GitHub::Ldap::MembershipValidators::Classic
159
end
1610

@@ -20,60 +14,38 @@ def make_validator(groups)
2014
end
2115

2216
def test_validates_user_in_group
23-
validator = make_validator(%w(group1.1.1.1))
17+
validator = make_validator(%w(nested-group1))
2418
assert validator.perform(@entry)
2519
end
2620

2721
def test_validates_user_in_child_group
28-
validator = make_validator(%w(group1.1.1))
22+
validator = make_validator(%w(n-depth-nested-group1))
2923
assert validator.perform(@entry)
3024
end
3125

3226
def test_validates_user_in_grandchild_group
33-
validator = make_validator(%w(group1.1))
27+
validator = make_validator(%w(n-depth-nested-group2))
3428
assert validator.perform(@entry)
3529
end
3630

3731
def test_validates_user_in_great_grandchild_group
38-
validator = make_validator(%w(group1))
32+
validator = make_validator(%w(n-depth-nested-group3))
3933
assert validator.perform(@entry)
4034
end
4135

4236
def test_does_not_validate_user_not_in_group
43-
validator = make_validator(%w(Enterprise))
37+
validator = make_validator(%w(ghe-admins))
4438
refute validator.perform(@entry)
4539
end
4640

4741
def test_does_not_validate_user_not_in_any_group
48-
@entry = @domain.user?('admin')
49-
validator = make_validator(%w(Enterprise))
42+
@entry = @domain.user?('groupless-user1')
43+
validator = make_validator(%w(all-users))
5044
refute validator.perform(@entry)
5145
end
52-
end
53-
54-
class GitHubLdapClassicMembershipValidatorsWithPosixGroupsTest < GitHub::Ldap::Test
55-
def self.test_server_options
56-
{ search_domains: "dc=github,dc=com",
57-
uid: "uid",
58-
custom_schemas: FIXTURES.join('posixGroup.schema.ldif'),
59-
user_fixtures: FIXTURES.join('github-with-posixGroups.ldif').to_s
60-
}
61-
end
62-
63-
def setup
64-
@ldap = GitHub::Ldap.new(options)
65-
@domain = @ldap.domain("dc=github,dc=com")
66-
@entry = @domain.user?('user1.1.1.1')
67-
@validator = GitHub::Ldap::MembershipValidators::Classic
68-
end
69-
70-
def make_validator(groups)
71-
groups = @domain.groups(groups)
72-
@validator.new(@ldap, groups)
73-
end
7446

75-
def test_validates_user_in_group
76-
validator = make_validator(%w(group1.1.1.1))
47+
def test_validates_user_in_posix_group
48+
validator = make_validator(%w(posix-group1))
7749
assert validator.perform(@entry)
7850
end
7951
end

‎test/membership_validators/recursive_test.rb

Lines changed: 12 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
require_relative '../test_helper'
22

33
class GitHubLdapRecursiveMembershipValidatorsTest < GitHub::Ldap::Test
4-
def self.test_server_options
5-
{ search_domains: "dc=github,dc=com",
6-
uid: "uid",
7-
user_fixtures: FIXTURES.join('github-with-subgroups.ldif').to_s
8-
}
9-
end
10-
114
def setup
12-
@ldap = GitHub::Ldap.new(options)
5+
@ldap = GitHub::Ldap.new(options.merge(search_domains: %w(dc=github,dc=com)))
136
@domain = @ldap.domain("dc=github,dc=com")
14-
@entry = @domain.user?('user1.1.1.1')
7+
@entry = @domain.user?('user1')
158
@validator = GitHub::Ldap::MembershipValidators::Recursive
169
end
1710

@@ -21,85 +14,43 @@ def make_validator(groups)
2114
end
2215

2316
def test_validates_user_in_group
24-
validator = make_validator(%w(group1.1.1.1))
17+
validator = make_validator(%w(nested-group1))
2518
assert validator.perform(@entry)
2619
end
2720

2821
def test_validates_user_in_child_group
29-
validator = make_validator(%w(group1.1.1))
22+
validator = make_validator(%w(n-depth-nested-group1))
3023
assert validator.perform(@entry)
3124
end
3225

3326
def test_validates_user_in_grandchild_group
34-
validator = make_validator(%w(group1.1))
27+
validator = make_validator(%w(n-depth-nested-group2))
3528
assert validator.perform(@entry)
3629
end
3730

3831
def test_validates_user_in_great_grandchild_group
39-
validator = make_validator(%w(group1))
32+
validator = make_validator(%w(n-depth-nested-group3))
4033
assert validator.perform(@entry)
4134
end
4235

4336
def test_does_not_validate_user_in_great_granchild_group_with_depth
44-
validator = make_validator(%w(group1))
37+
validator = make_validator(%w(n-depth-nested-group3))
4538
refute validator.perform(@entry, 2)
4639
end
4740

4841
def test_does_not_validate_user_not_in_group
49-
validator = make_validator(%w(Enterprise))
42+
validator = make_validator(%w(ghe-admins))
5043
refute validator.perform(@entry)
5144
end
5245

5346
def test_does_not_validate_user_not_in_any_group
54-
@entry = @domain.user?('admin')
55-
validator = make_validator(%w(Enterprise))
47+
@entry = @domain.user?('groupless-user1')
48+
validator = make_validator(%w(all-users))
5649
refute validator.perform(@entry)
5750
end
58-
end
59-
60-
class GitHubLdapRecursiveMembershipValidatorsWithPosixGroupsTest < GitHub::Ldap::Test
61-
def self.test_server_options
62-
{ search_domains: "dc=github,dc=com",
63-
uid: "uid",
64-
custom_schemas: FIXTURES.join('posixGroup.schema.ldif'),
65-
user_fixtures: FIXTURES.join('github-with-posixGroups.ldif').to_s
66-
}
67-
end
68-
69-
def setup
70-
@ldap = GitHub::Ldap.new(options)
71-
@domain = @ldap.domain("dc=github,dc=com")
72-
@entry = @domain.user?('user1.1.1.1')
73-
@validator = GitHub::Ldap::MembershipValidators::Recursive
74-
end
75-
76-
def make_validator(groups)
77-
groups = @domain.groups(groups)
78-
@validator.new(@ldap, groups)
79-
end
80-
81-
def test_validates_user_in_group
82-
validator = make_validator(%w(group1.1.1.1))
83-
assert validator.perform(@entry)
84-
end
85-
86-
def test_validates_user_in_child_group
87-
validator = make_validator(%w(group1.1.1))
88-
assert validator.perform(@entry)
89-
end
90-
91-
def test_validates_user_in_grandchild_group
92-
validator = make_validator(%w(group1.1))
93-
assert validator.perform(@entry)
94-
end
9551

96-
def test_validates_user_in_great_grandchild_group
97-
validator = make_validator(%w(group1))
52+
def test_validates_user_in_posix_group
53+
validator = make_validator(%w(posix-group1))
9854
assert validator.perform(@entry)
9955
end
100-
101-
def test_does_not_validate_user_in_great_granchild_group_with_depth
102-
validator = make_validator(%w(group1))
103-
refute validator.perform(@entry, 2)
104-
end
10556
end

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy