diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8e716fefab..e655417add 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,6 @@ jobs: fail-fast: false matrix: rails: - - "6.1" - "7.0" ruby: - "3.0" diff --git a/alchemy_cms.gemspec b/alchemy_cms.gemspec index 5e227561b4..32d448d9a6 100644 --- a/alchemy_cms.gemspec +++ b/alchemy_cms.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |gem| activesupport railties ].each do |rails_gem| - gem.add_runtime_dependency rails_gem, [">= 6.1", "< 7.1"] + gem.add_runtime_dependency rails_gem, [">= 7.0", "< 7.1"] end gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"] diff --git a/app/models/alchemy/picture/url.rb b/app/models/alchemy/picture/url.rb index 4915a90927..a4e7cdc46b 100644 --- a/app/models/alchemy/picture/url.rb +++ b/app/models/alchemy/picture/url.rb @@ -35,7 +35,7 @@ def uid thumb.uid else uid = PictureThumb::Uid.call(signature, variant) - ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do + ActiveRecord::Base.connected_to(role: ActiveRecord.writing_role) do PictureThumb::Create.call(variant, signature, uid) end uid diff --git a/spec/models/alchemy/picture/url_spec.rb b/spec/models/alchemy/picture/url_spec.rb index c78853a5bf..3ba99e4a1d 100644 --- a/spec/models/alchemy/picture/url_spec.rb +++ b/spec/models/alchemy/picture/url_spec.rb @@ -36,7 +36,7 @@ end it "connects to writing database" do - writing_role = ActiveRecord::Base.writing_role + writing_role = ActiveRecord.writing_role expect(ActiveRecord::Base).to receive(:connected_to).with(role: writing_role) subject end