diff --git a/.rbnextrc b/.rbnextrc index d4cb1e16..02071bf9 100644 --- a/.rbnextrc +++ b/.rbnextrc @@ -1,5 +1,4 @@ nextify: | ./lib - --min-version=2.6 + --min-version=2.7 --edge - --proposed diff --git a/CHANGELOG.md b/CHANGELOG.md index d4f503d2..3a28f7d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ## master - - Let authorize! return the policy record ([@sedubois][]) - Enable `allowance_to` as a helper method by default ([@stephannv][]) @@ -544,3 +543,5 @@ This value is now stored in a cache (if any) instead of just the call result (`t [@matsales28]: https://github.com/matsales28 [@killondark]: https://github.com/killondark [@Spone]: https://github.com/Spone +[@stephannv]: https://github.com/stephannv +[@sedubois]: https://github.com/sedubois diff --git a/Gemfile b/Gemfile index 6bfa7cdf..a854c054 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,6 @@ gem "debug", platform: :mri unless ENV["CI"] == "true" gem "method_source" gem "prism" -gem 'sqlite3', "~> 2.0", platform: :mri gem 'activerecord-jdbcsqlite3-adapter', '~> 50.0', platform: :jruby gem 'jdbc-sqlite3', platform: :jruby @@ -20,6 +19,7 @@ local_gemfile = File.join(__dir__, "Gemfile.local") if File.exist?(local_gemfile) eval(File.read(local_gemfile)) # rubocop:disable Security/Eval else + gem "sqlite3", "~> 2.0" gem "rails", "~> 8.0" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 413e533d..1baff13b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -27,9 +27,10 @@ ENV["RUBY_NEXT_TRANSPILE_MODE"] = "rewrite" ENV["RUBY_NEXT_EDGE"] = "1" -ENV["RUBY_NEXT_PROPOSED"] = "1" require "ruby-next/language/runtime" unless ENV["CI"] +require "logger" + require "action_policy" begin require "pry-byebug" diff --git a/test/action_policy/rails/dummy/config/environment.rb b/test/action_policy/rails/dummy/config/environment.rb index 78973b15..7acd2cd5 100644 --- a/test/action_policy/rails/dummy/config/environment.rb +++ b/test/action_policy/rails/dummy/config/environment.rb @@ -1,5 +1,8 @@ # frozen_string_literal: true +# See https://github.com/rails/rails/issues/54263 +require "logger" + # Load the Rails application. require File.expand_path("application", __dir__) diff --git a/test/test_helper.rb b/test/test_helper.rb index 747b26aa..a41843a7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -34,9 +34,10 @@ ENV["RUBY_NEXT_TRANSPILE_MODE"] = "rewrite" ENV["RUBY_NEXT_EDGE"] = "1" -ENV["RUBY_NEXT_PROPOSED"] = "1" require "ruby-next/language/runtime" unless ENV["CI"] +require "logger" + require "action_policy" ActionPolicy::PrettyPrint.ignore_expressions << /\bjard\b/