diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-08-29 17:29:42 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-08-29 17:30:42 +0200 |
| commit | 0d5ae2802e887dcd95fe537a59450a2c0f548382 (patch) | |
| tree | 5b65aaf99fe126f6361f36083261789b0143330f | |
| parent | 97547428bd481b984a4c5513931617db0d890ee5 (diff) | |
| download | gitlab-ce-0d5ae2802e887dcd95fe537a59450a2c0f548382.tar.gz | |
Move and rename ldap / oauth specs
| -rw-r--r-- | lib/gitlab/ldap/adapter.rb | 3 | ||||
| -rw-r--r-- | spec/lib/gitlab/auth_spec.rb (renamed from spec/lib/auth_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/lib/gitlab/ldap/user_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/oauth/user_spec.rb (renamed from spec/lib/oauth_spec.rb) | 0 |
4 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/user_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb index 501642dca79..71b316bee2f 100644 --- a/spec/lib/gitlab/ldap/user_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 |