Merge pull request flippercloud#833 from pbstriker38/fix_tests

Fix tests
nicastelo · Feb 2, 2024 · 2abe198 · 2abe198
2 parents 5102d4e + c757e3b
commit 2abe198
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     strategy:
+      fail-fast: false
       matrix:
         ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0']

diff --git a/lib/flipper/api.rb b/lib/flipper/api.rb
@@ -14,6 +14,7 @@ def self.app(flipper = nil, options = {})
       yield builder if block_given?
       builder.use Rack::Head
       builder.use Rack::Deflater
+      builder.use Rack::RewindableInput::Middleware if Gem::Version.new(Rack.release) >= Gem::Version.new('3.0.0')
       builder.use Flipper::Api::JsonParams
       builder.use Flipper::Middleware::SetupEnv, flipper, env_key: env_key
       builder.use Flipper::Api::Middleware, env_key: env_key

diff --git a/spec/flipper/adapters/active_record_spec.rb b/spec/flipper/adapters/active_record_spec.rb
@@ -1,5 +1,5 @@
 SpecHelpers.silence { require 'flipper/adapters/active_record' }
-require 'active_support/core_ext/kernel'
+require 'active_support/core_ext/hash/indifferent_access'
 
 # Turn off migration logging for specs
 ActiveRecord::Migration.verbose = false