bundle update net-ldap

Change-Id: I95ebf6df7b6ab83d59880cc9c5275534284855cf
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325490
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>

Gemfile.d/app.rb

@@ -93,7 +93,7 @@ gem "mime-types", "~> 3.5"
 gem "mini_magick", "4.11.0"
 gem "multi_json", "1.15.0"
 gem "net-http", "~> 0.1", require: false
-gem "net-ldap", "0.16.3", require: false
+gem "net-ldap", "~> 0.18", require: false
 gem "net-imap", "~> 0.3", require: false
 gem "net-pop", "~> 0.1", require: false
 gem "net-smtp", "~> 0.3", require: false

Gemfile.lock

@@ -737,7 +737,7 @@ GEM
     net-imap (0.3.7)
       date
       net-protocol
-    net-ldap (0.16.3)
+    net-ldap (0.18.0)
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
@@ -1290,7 +1290,7 @@ DEPENDENCIES
   multi_json (= 1.15.0)
   net-http (~> 0.1)
   net-imap (~> 0.3)
-  net-ldap (= 0.16.3)
+  net-ldap (~> 0.18)
   net-pop (~> 0.1)
   net-smtp (~> 0.3)
   nokogiri (~> 1.13.8)

app/models/authentication_provider/ldap.rb

@@ -227,7 +227,7 @@ class AuthenticationProvider::LDAP < AuthenticationProvider
         :ldap_login_test,
         t(:test_login_auth_failed, "Authentication failed")
       )
-    rescue Net::LDAP::LdapError => e
+    rescue Net::LDAP::Error => e
       errors.add(
         :ldap_login_test,
         t(:test_login_auth_exception, "Exception on login: %{error}", error: e)

spec/models/pseudonym_spec.rb

@@ -190,9 +190,9 @@ describe Pseudonym do
     end
 
     it "gracefully handles unreachable LDAP servers" do
-      expect_any_instance_of(Net::LDAP).to receive(:bind_as).and_raise(Net::LDAP::LdapError, "no connection to server")
+      expect_any_instance_of(Net::LDAP).to receive(:bind_as).and_raise(Net::LDAP::Error, "no connection to server")
       expect(Canvas::Errors).to receive(:capture) do |ex, data, level|
-        expect(ex.class).to eq(Net::LDAP::LdapError)
+        expect(ex.class).to eq(Net::LDAP::Error)
         expect(data[:account]).to eq(@pseudonym.account)
         expect(level).to eq(:warn)
       end.and_call_original