diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /spec/tasks | |
parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
download | gitlab-ce-dc889678d1de8c09310b2f8f9742bb6c78a6f1a4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tasks')
-rw-r--r-- | spec/tasks/gitlab/check_rake_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/tasks/gitlab/check_rake_spec.rb b/spec/tasks/gitlab/check_rake_spec.rb index b3c8ca03aec..e3e2a22add9 100644 --- a/spec/tasks/gitlab/check_rake_spec.rb +++ b/spec/tasks/gitlab/check_rake_spec.rb @@ -68,8 +68,8 @@ describe 'check.rake' do context 'when LDAP is not enabled' do it 'does not attempt to bind or search for users' do - expect(Gitlab::Auth::LDAP::Config).not_to receive(:providers) - expect(Gitlab::Auth::LDAP::Adapter).not_to receive(:open) + expect(Gitlab::Auth::Ldap::Config).not_to receive(:providers) + expect(Gitlab::Auth::Ldap::Adapter).not_to receive(:open) subject end @@ -80,12 +80,12 @@ describe 'check.rake' do let(:adapter) { ldap_adapter('ldapmain', ldap) } before do - allow(Gitlab::Auth::LDAP::Config) + allow(Gitlab::Auth::Ldap::Config) .to receive_messages( enabled?: true, providers: ['ldapmain'] ) - allow(Gitlab::Auth::LDAP::Adapter).to receive(:open).and_yield(adapter) + allow(Gitlab::Auth::Ldap::Adapter).to receive(:open).and_yield(adapter) allow(adapter).to receive(:users).and_return([]) end |