Merge branch 'feature-ldap-tests' into 'master'

Feature ldap tests

Move specs to proper places. Relates to #154

This is already mergeable, will continue in a new branch for additions & refactorings.

See merge request !1053

6 files changed, 3 insertions, 2 deletions

diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index ca239bea884..68ac1b22909 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -86,7 +86,8 @@ module Gitlab
       end
 
       def dn_matches_filter?(dn, filter)
-        ldap_search(base: dn, filter: filter, scope: Net::LDAP::SearchScope_BaseObject, attributes: %w{dn}).any?
+        ldap_search(base: dn, filter: filter,
+          scope: Net::LDAP::SearchScope_BaseObject, attributes: %w{dn}).any?
       end
 
       def ldap_search(*args)
diff --git a/spec/lib/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 073b811c3fb..073b811c3fb 100644
--- a/spec/lib/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
diff --git a/spec/lib/gitlab/ldap/ldap_access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb
index d8c107502ba..d8c107502ba 100644
--- a/spec/lib/gitlab/ldap/ldap_access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
diff --git a/spec/lib/gitlab/ldap/ldap_adapter_spec.rb b/spec/lib/gitlab/ldap/adapter_spec.rb
index c3f07334431..c3f07334431 100644
--- a/spec/lib/gitlab/ldap/ldap_adapter_spec.rb
+++ b/spec/lib/gitlab/ldap/adapter_spec.rb
diff --git a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb
index 1d3df52f0c2..de5717417f1 100644
--- a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb
+++ b/spec/lib/gitlab/ldap/user_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::LDAP do
+describe Gitlab::LDAP::User do
   let(:gl_auth) { Gitlab::LDAP::User }
 
   before do
diff --git a/spec/lib/oauth_spec.rb b/spec/lib/gitlab/oauth/user_spec.rb
index 2f15b5e0349..2f15b5e0349 100644
--- a/spec/lib/oauth_spec.rb
+++ b/spec/lib/gitlab/oauth/user_spec.rb