diff options
author | Michael Kozono <mkozono@gmail.com> | 2017-06-09 20:39:29 +0300 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-07-26 12:43:36 +0300 |
commit | 72d8b1e40aa96f575aac9a8c9dada09e66cd7a9d (patch) | |
tree | 6e9ce22aa0aa4f6a3e18f52952d95a414f7e5b79 /spec/lib/gitlab | |
parent | 2d7d1fa69db2b5e0056d5ab8884684886229f852 (diff) |
Move backwards compatibility logic out of the code
And closer to the configuration setup. The code doesn’t need to know about this.
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/ldap/config_spec.rb | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/spec/lib/gitlab/ldap/config_spec.rb b/spec/lib/gitlab/ldap/config_spec.rb index 7679c9ea913..e3a9505531d 100644 --- a/spec/lib/gitlab/ldap/config_spec.rb +++ b/spec/lib/gitlab/ldap/config_spec.rb @@ -69,18 +69,6 @@ describe Gitlab::LDAP::Config, lib: true do expect(config.adapter_options[:encryption]).to include({ method: :simple_tls }) end - it 'sets encryption method to simple_tls when configured as ssl, for backwards compatibility' do - stub_ldap_config( - options: { - 'host' => 'ldap.example.com', - 'port' => 686, - 'encryption' => 'ssl' - } - ) - - expect(config.adapter_options[:encryption]).to include({ method: :simple_tls }) - end - it 'sets encryption method to start_tls when configured as start_tls' do stub_ldap_config( options: { @@ -93,18 +81,6 @@ describe Gitlab::LDAP::Config, lib: true do expect(config.adapter_options[:encryption]).to include({ method: :start_tls }) end - it 'sets encryption method to start_tls when configured as tls, for backwards compatibility' do - stub_ldap_config( - options: { - 'host' => 'ldap.example.com', - 'port' => 686, - 'encryption' => 'tls' - } - ) - - expect(config.adapter_options[:encryption]).to include({ method: :start_tls }) - end - context 'when verify_certificates is enabled' do it 'sets tls_options to OpenSSL defaults' do stub_ldap_config( |