Clean up various spots that were patched to support EOL Rails versions

flippercloud · Nov 18, 2024 · 1a59fab · 1a59fab
1 parent f739847
commit 1a59fab
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 51 deletions.
diff --git a/lib/flipper/instrumentation/log_subscriber.rb b/lib/flipper/instrumentation/log_subscriber.rb
@@ -77,8 +77,7 @@ def self.attach
       end
 
       def self.detach
-        # Rails 5.2 doesn't support this, that's fine
-        detach_from InstrumentationNamespace if respond_to?(:detach_from)
+        detach_from InstrumentationNamespace
       end
 
       private

diff --git a/lib/flipper/version.rb b/lib/flipper/version.rb
@@ -1,11 +1,11 @@
 module Flipper
   VERSION = '1.3.1'.freeze
 
-  REQUIRED_RUBY_VERSION = '2.6'.freeze
-  NEXT_REQUIRED_RUBY_VERSION = '3.0'.freeze
+  REQUIRED_RUBY_VERSION = '3.1'.freeze
+  NEXT_REQUIRED_RUBY_VERSION = '3.2'.freeze
 
-  REQUIRED_RAILS_VERSION = '5.2'.freeze
-  NEXT_REQUIRED_RAILS_VERSION = '6.1.0'.freeze
+  REQUIRED_RAILS_VERSION = '7.0'.freeze
+  NEXT_REQUIRED_RAILS_VERSION = '7.1'.freeze
 
   def self.deprecated_ruby_version?
     Gem::Version.new(RUBY_VERSION) < Gem::Version.new(NEXT_REQUIRED_RUBY_VERSION)

diff --git a/script/test b/script/test
@@ -12,26 +12,6 @@ cd $(dirname "$0")/..
     exit 0
 }
 
-export RAILS_VERSION=5.0.0
-script/bootstrap || bundle update
-bundle exec rake
-
-export RAILS_VERSION=5.1.4
-script/bootstrap || bundle update
-bundle exec rake
-
-export RAILS_VERSION=5.2.3
-script/bootstrap || bundle update
-bundle exec rake
-
-export RAILS_VERSION=6.0.0
-script/bootstrap || bundle update
-bundle exec rake
-
-export RAILS_VERSION=6.1.0
-script/bootstrap || bundle update
-bundle exec rake
-
 export RAILS_VERSION=7.0.0
 script/bootstrap || bundle update
 bundle exec rake

diff --git a/spec/flipper/engine_spec.rb b/spec/flipper/engine_spec.rb
@@ -298,22 +298,10 @@
   end
 
   context 'with cloud secrets in Rails.credentials' do
-    around do |example|
-      # Create temporary directory for Rails.root to write credentials to
-      # Once Rails 5.2 support is dropped, this can all be replaced with
-      # `config.credentials.content_path = Tempfile.new.path`
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          Dir.mkdir("#{dir}/config")
-
-          example.run
-        end
-      end
-    end
-
     before do
       # Set master key which is needed to write credentials
       ENV["RAILS_MASTER_KEY"] = "a" * 32
+      application.config.credentials.content_path = Tempfile.new.path
 
       application.credentials.write(YAML.dump({
         flipper: {

diff --git a/spec/flipper/instrumentation/log_subscriber_spec.rb b/spec/flipper/instrumentation/log_subscriber_spec.rb
@@ -1,12 +1,7 @@
 require 'logger'
 require 'flipper/instrumentation/log_subscriber'
 require 'flipper/adapters/instrumented'
-
-begin
-  require 'active_support/isolated_execution_state'
-rescue LoadError
-  # ActiveSupport::IsolatedExecutionState is only available in Rails 5.2+
-end
+require 'active_support/isolated_execution_state'
 
 # Don't log in other tests, we'll manually re-attach when this one starts
 Flipper::Instrumentation::LogSubscriber.detach

diff --git a/spec/flipper/instrumentation/statsd_subscriber_spec.rb b/spec/flipper/instrumentation/statsd_subscriber_spec.rb
@@ -1,11 +1,6 @@
 require 'flipper/adapters/instrumented'
 require 'flipper/instrumentation/statsd'
-
-begin
-  require 'active_support/isolated_execution_state'
-rescue LoadError
-  # ActiveSupport::IsolatedExecutionState is only available in Rails 5.2+
-end
+require 'active_support/isolated_execution_state'
 
 RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
   let(:statsd_client) { Statsd.new }