From c212740b7e2bdabca879ea57e1b7eddbf9badb48 Mon Sep 17 00:00:00 2001 From: khiav reoy Date: Sun, 24 Dec 2023 22:07:30 +0800 Subject: [PATCH] Support Rails 7.1 --- .github/workflows/ruby.yml | 7 +++++++ gemfiles/active_record_71.gemfile | 19 +++++++++++++++++++ test/active_record/carrierwave_test.rb | 7 ++++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gemfiles/active_record_71.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 4764a14..d97a3f6 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -37,6 +37,7 @@ jobs: - active_record_60.gemfile - active_record_61.gemfile - active_record_70.gemfile + - active_record_71.gemfile - mongoid_54.gemfile - mongoid_64.gemfile - mongoid_73.gemfile @@ -91,6 +92,12 @@ jobs: ruby: 2.6 - gemfile: active_record_70.gemfile orm: MONGOID + - gemfile: active_record_71.gemfile + ruby: 2.3 + - gemfile: active_record_71.gemfile + ruby: 2.6 + - gemfile: active_record_71.gemfile + orm: MONGOID - gemfile: mongoid_54.gemfile ruby: 2.7 - gemfile: mongoid_54.gemfile diff --git a/gemfiles/active_record_71.gemfile b/gemfiles/active_record_71.gemfile new file mode 100644 index 0000000..b60b0c4 --- /dev/null +++ b/gemfiles/active_record_71.gemfile @@ -0,0 +1,19 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in pluck_all.gemspec + +gem 'sqlite3', '~> 1.4.1' +gem 'zeitwerk' +gem 'activerecord', '~> 7.1.2' +gem 'rails_compatibility', '~> 0.0.7' + +gem 'carrierwave', '~> 0.11.0' +gem 'mimemagic', '< 0.4.3' # Used by carrierwave gem + +# gem 'globalize', '~> 6.0.1' # TODO: wait for globalize to support Rails 7. + +group :test do + gem 'simplecov', '< 0.18' +end + +gemspec path: '../' diff --git a/test/active_record/carrierwave_test.rb b/test/active_record/carrierwave_test.rb index 27031dd..280e902 100644 --- a/test/active_record/carrierwave_test.rb +++ b/test/active_record/carrierwave_test.rb @@ -43,7 +43,12 @@ def test_pluck_without_carrierwave def test_pluck_without_cast_need_columns error = assert_raises(ActiveModel::MissingAttributeError){ @users.pluck_all(:name, :pet_pic) } - assert_equal 'missing attribute: name', error.message + + if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('7.1.0') + assert_equal "missing attribute 'name' for User", error.message + else + assert_equal 'missing attribute: name', error.message + end end def test_pluck_with_carrierwave_and_join