Include general membership validator test cases

mtodd · mtodd · commit 108d29081b13 · 2014-10-08T02:03:22.000-07:00
diff --git a/test/membership_validators_test.rb b/test/membership_validators_test.rb
@@ -7,52 +7,40 @@ def make_validator(groups)
   end
 
   def test_validates_user_in_group
-    validator = make_validator(%w(Enterprise))
+    validator = make_validator(%w(ghe-users))
     assert validator.perform(@entry)
   end
 
   def test_does_not_validate_user_not_in_group
-    validator = make_validator(%w(People))
+    validator = make_validator(%w(ghe-admins))
     refute validator.perform(@entry)
   end
 
   def test_does_not_validate_user_not_in_any_group
-    @entry = @domain.user?('ldaptest')
-    validator = make_validator(%w(Enterprise People))
+    @entry = @domain.user?('groupless-user1')
+    validator = make_validator(%w(ghe-users ghe-admins))
     refute validator.perform(@entry)
   end
 end
 
 class GitHubLdapMembershipValidatorsClassicTest < GitHub::Ldap::Test
   include GitHubLdapMembershipValidatorsTestCases
 
-  def self.test_server_options
-    { search_domains: "dc=github,dc=com",
-      uid: "uid"
-    }
-  end
-
   def setup
-    @ldap      = GitHub::Ldap.new(options)
+    @ldap      = GitHub::Ldap.new(options.merge(search_domains: "dc=github,dc=com"))
     @domain    = @ldap.domain("dc=github,dc=com")
-    @entry     = @domain.user?('calavera')
+    @entry     = @domain.user?('user1')
     @validator = GitHub::Ldap::MembershipValidators::Classic
   end
 end
 
 class GitHubLdapMembershipValidatorsRecursiveTest < GitHub::Ldap::Test
   include GitHubLdapMembershipValidatorsTestCases
 
-  def self.test_server_options
-    { search_domains: "dc=github,dc=com",
-      uid: "uid"
-    }
-  end
-
   def setup
-    @ldap      = GitHub::Ldap.new(options)
+    @ldap      = GitHub::Ldap.new(options.merge(search_domains: "dc=github,dc=com"))
     @domain    = @ldap.domain("dc=github,dc=com")
-    @entry     = @domain.user?('calavera')
+    @entry     = @domain.user?('user1')
     @validator = GitHub::Ldap::MembershipValidators::Recursive
   end
 end
