Merge pull request #89 from fbacall/master

Author: BobbyMcWho

lib/omniauth-ldap/adaptor.rb

@@ -60,8 +60,8 @@ def initialize(configuration={})
                     :password => @password
                   }
         config[:auth] = @auth
+        config[:encryption] = method
         @connection = Net::LDAP.new(config)
-        @connection.encryption(method)
       end
 
       #:base => "dc=yourcompany, dc=com",

omniauth-ldap.gemspec

@@ -9,13 +9,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/intridea/omniauth-ldap"
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency     'omniauth', '~> 1.8.1'
+  gem.add_runtime_dependency     'omniauth', '~> 2.0.0'
   gem.add_runtime_dependency     'net-ldap', '~> 0.16'
   gem.add_runtime_dependency     'pyu-ruby-sasl', '~> 0.0.3.3'
   gem.add_runtime_dependency     'rubyntlm', '~> 0.6.2'
   gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'rack-test'
+  gem.add_development_dependency 'simplecov', '~> 0.11'
+  gem.add_development_dependency 'rack-test', '~> 0.6', '>= 0.6.3'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

spec/omniauth/strategies/ldap_spec.rb

@@ -27,9 +27,18 @@ class MyLdapProvider < OmniAuth::Strategies::LDAP; end
     expect(OmniAuth::Utils.camelize('ldap')).to eq 'LDAP'
   end
 
-  describe '/auth/ldap' do
+  describe 'get /auth/ldap' do
     before(:each){ get '/auth/ldap' }
 
+    it 'should return 404' do
+      expect(last_response.status).to eq 404
+      expect(last_response.body).to_not include("<form")
+    end
+  end
+
+  describe '/auth/ldap' do
+    before(:each){ post('/auth/ldap', {}) }
+
     it 'should display a form' do
       expect(last_response.status).to eq 200
       expect(last_response.body).to include("<form")

spec/spec_helper.rb

@@ -7,6 +7,10 @@
 require 'omniauth'
 require 'omniauth-ldap'
 
+TEST_LOGGER = Logger.new(StringIO.new)
+OmniAuth.config.logger = TEST_LOGGER
+OmniAuth.config.request_validation_phase = proc {}
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy