Merge pull request #214 from stanhu/sh-fix-ci

ci: make all tests pass again
doorkeeper-gem · Nov 28, 2024 · dec2d4f · dec2d4f
2 parents ab28ba3 + 7caee3b
commit dec2d4f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ jobs:
       Ruby ${{ matrix.ruby }} (${{ matrix.gemfile }})
     env:
       CI: true
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
 
     runs-on: ${{ matrix.os }}
     if: |

diff --git a/doorkeeper-openid_connect.gemspec b/doorkeeper-openid_connect.gemspec
@@ -24,11 +24,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'doorkeeper', '>= 5.5', '< 5.8'
+  spec.add_runtime_dependency 'doorkeeper', '>= 5.5', '< 5.9'
   spec.add_runtime_dependency 'jwt', '>= 2.5'
 
+  spec.add_development_dependency 'bigdecimal'
   spec.add_development_dependency 'conventional-changelog', '~> 1.2'
+  spec.add_development_dependency 'drb'
   spec.add_development_dependency 'factory_bot'
+  spec.add_development_dependency 'mutex_m'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'sqlite3', '>= 1.3.6'

diff --git a/spec/controllers/doorkeeper/authorizations_controller_spec.rb b/spec/controllers/doorkeeper/authorizations_controller_spec.rb
@@ -82,14 +82,14 @@ def expect_successful_callback!
         it 'render error when client_id is missing' do
           authorize!(client_id: nil)
 
-          expect(response).to be_successful
+          expect(response).to have_http_status(:bad_request)
           expect(response).to render_template('doorkeeper/authorizations/error')
         end
 
         it 'render error when response_type is missing' do
           authorize!(response_type: nil)
 
-          expect(response).to be_successful
+          expect(response).to have_http_status(:bad_request)
           expect(response).to render_template('doorkeeper/authorizations/error')
         end
       end

diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
@@ -19,7 +19,10 @@
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = false
+  # Rails 7.1 deprecated false in favor of :none, but we need to use false for
+  # backwards compatibility: https://github.com/rails/rails/pull/45867
+  config.action_dispatch.show_exceptions =
+    Rails.gem_version >= Gem::Version.new('7.1.0') ? :none : false
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false