Update to Rails 6

doorkeeper-gem · May 19, 2020 · 84b4481 · 84b4481
1 parent 91a7639
commit 84b4481
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,10 @@ script:
 env:
   - rails=5.0.0
   - rails=5.2.0
+  - rails=6.0.0
 
 rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # use Rails version specified by environment
-ENV['rails'] ||= '5.2.0'
+ENV['rails'] ||= '6.0.0'
 gem 'rails', "~> #{ENV['rails']}"
 gem 'rails-controller-testing'
 

diff --git a/app/controllers/doorkeeper/openid_connect/discovery_controller.rb b/app/controllers/doorkeeper/openid_connect/discovery_controller.rb
@@ -30,7 +30,7 @@ def provider_response
           introspection_endpoint: oauth_introspect_url(protocol: protocol),
           userinfo_endpoint: oauth_userinfo_url(protocol: protocol),
           jwks_uri: oauth_discovery_keys_url(protocol: protocol),
-          end_session_endpoint: Doorkeeper::OpenidConnect.configuration.end_session_endpoint.call(),
+          end_session_endpoint: openid_connect.end_session_endpoint.call,
 
           scopes_supported: doorkeeper.scopes,
 

diff --git a/doorkeeper-openid_connect.gemspec b/doorkeeper-openid_connect.gemspec
@@ -24,9 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'factory_bot'
-  # We need to stick to this sqlite3 version for Rails 5.0
-  # https://github.com/rails/rails/pull/35154
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3', '~> 1.4'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'conventional-changelog', '~> 1.2'
 end