diff --git a/.travis.yml b/.travis.yml index f313f2a..ba4092c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,11 @@ env: - JRUBY_OPTS="$JRUBY_OPTS --debug" language: ruby rvm: - - jruby-9000 - - 2.2.9 - - 2.3.6 - - 2.4.3 - - 2.5.0 + - jruby-9.2.14.0 + - 2.4.10 + - 2.5.8 + - 2.6.6 + - 2.7.2 - jruby-head - ruby-head matrix: diff --git a/Gemfile.lock b/Gemfile.lock index d06610d..1bd018e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,8 +7,8 @@ GIT PATH remote: . specs: - omniauth-openid (1.0.1) - omniauth (~> 1.0) + omniauth-openid (2.0.0) + omniauth (>= 1.0, < 3.0) rack-openid (~> 1.4.0) GEM @@ -21,14 +21,15 @@ GEM diff-lcs (1.3) docile (1.1.5) hashdiff (0.3.7) - hashie (3.5.7) + hashie (4.1.0) json (2.1.0) mustermann (1.0.1) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (2.0.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) + rack-protection public_suffix (3.0.1) - rack (2.0.3) + rack (2.2.3) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -84,4 +85,4 @@ DEPENDENCIES yard (>= 0.9.11) BUNDLED WITH - 1.15.4 + 2.2.5 diff --git a/omniauth-openid.gemspec b/omniauth-openid.gemspec index 09d46f9..791b958 100644 --- a/omniauth-openid.gemspec +++ b/omniauth-openid.gemspec @@ -2,7 +2,7 @@ require File.expand_path('../lib/omniauth-openid/version', __FILE__) Gem::Specification.new do |gem| - gem.add_dependency 'omniauth', '~> 1.0' + gem.add_dependency 'omniauth', ['>= 1.0', '< 3.0'] gem.add_dependency 'rack-openid', '~> 1.4.0' gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober', 'Tom Milewski'] diff --git a/spec/omniauth/strategies/open_id_spec.rb b/spec/omniauth/strategies/open_id_spec.rb index d1e749d..1e53856 100644 --- a/spec/omniauth/strategies/open_id_spec.rb +++ b/spec/omniauth/strategies/open_id_spec.rb @@ -18,7 +18,7 @@ def expired_query_string describe '/auth/open_id without an identifier URL' do before do - get '/auth/open_id' + post '/auth/open_id' end it 'should respond with OK' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7a7eea5..a09eb86 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,3 +11,7 @@ config.include WebMock::API config.include Rack::Test::Methods end + +if OmniAuth.config.respond_to?(:request_validation_phase) + OmniAuth.config.request_validation_phase = ->(env) {} +end