Commit 14f5199c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents cb71b263 0d5ae280
...@@ -86,7 +86,8 @@ module Gitlab ...@@ -86,7 +86,8 @@ module Gitlab
end end
def dn_matches_filter?(dn, filter) 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 end
def ldap_search(*args) def ldap_search(*args)
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::LDAP do describe Gitlab::LDAP::User do
let(:gl_auth) { Gitlab::LDAP::User } let(:gl_auth) { Gitlab::LDAP::User }
before do before do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment