Add option to gitlab config to specify if LDAP server is active directory.

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb
index 2307a03f656..d50f605e050 100644
--- a/spec/lib/gitlab/ldap/access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
@@ -27,6 +27,21 @@ describe Gitlab::LDAP::Access do
 
         it { should be_true }
       end
+
+      context 'and has no disabled flag in active diretory' do
+        before {
+          Gitlab::LDAP::Person.stub(disabled_via_active_directory?: false)
+          Gitlab.config.ldap['enabled'] = true
+          Gitlab.config.ldap['active_directory'] = false
+        }
+
+        after {
+          Gitlab.config.ldap['enabled'] = false
+          Gitlab.config.ldap['active_directory'] = true
+        }
+
+        it { should be_false }
+      end
     end
   end
 end