summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-01-14 03:31:27 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2016-01-14 03:31:27 -0200
commitdd6fc01ff8a073880b67a323a547edeb5d63f167 (patch)
tree6d6140793653da8699a038cf538e4fe763143649 /spec/lib
parentfc7e6e8ffcb76e92b625b6490a966c830adc750a (diff)
downloadgitlab-ce-dd6fc01ff8a073880b67a323a547edeb5d63f167.tar.gz
fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecases
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/ldap/access_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb
index f58d70e809c..32a19bf344b 100644
--- a/spec/lib/gitlab/ldap/access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
@@ -42,7 +42,6 @@ describe Gitlab::LDAP::Access, lib: true do
context 'and has no disabled flag in active diretory' do
before do
- user.block
allow(Gitlab::LDAP::Person).to receive(:disabled_via_active_directory?).and_return(false)
end
@@ -50,7 +49,7 @@ describe Gitlab::LDAP::Access, lib: true do
context 'when auto-created users are blocked' do
before do
- allow_any_instance_of(Gitlab::LDAP::Config).to receive(:block_auto_created_users).and_return(true)
+ user.block
end
it 'does not unblock user in GitLab' do
@@ -62,7 +61,7 @@ describe Gitlab::LDAP::Access, lib: true do
context 'when auto-created users are not blocked' do
before do
- allow_any_instance_of(Gitlab::LDAP::Config).to receive(:block_auto_created_users).and_return(false)
+ user.ldap_block
end
it 'should unblock user in GitLab' do