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
This commit is contained in:
Dmitriy Zaporozhets 2014-08-30 07:16:45 +00:00
commit 14f5199cdc
6 changed files with 3 additions and 2 deletions

View File

@ -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)

View File

@ -1,6 +1,6 @@
require 'spec_helper'
describe Gitlab::LDAP do
describe Gitlab::LDAP::User do
let(:gl_auth) { Gitlab::LDAP::User }
before do