Skip to content

Commit 4f31ebd

Browse files
committed
Support Rails 8
1 parent bda1950 commit 4f31ebd

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ jobs:
1313
matrix:
1414
include:
1515
# Recent Rubies and Rails
16+
- ruby-version: '3.3'
17+
rails-version: '8.0'
18+
- ruby-version: '3.2'
19+
rails-version: '8.0'
20+
- ruby-version: '3.2'
21+
rails-version: '7.2'
1622
- ruby-version: '3.2'
1723
rails-version: '7.1'
1824
- ruby-version: '3.1'

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ end
6060

6161
group :test do
6262
platforms(*(@windows_platforms + [:ruby])) do
63-
if version == 'master' || version >= '6'
63+
if version >= '8'
64+
gem 'sqlite3', '~> 2.1'
65+
elsif version == 'master' || version >= '6'
6466
gem 'sqlite3', '< 1.6'
6567
else
6668
gem 'sqlite3', '~> 1.3.13'

lib/active_model_serializers/adapter/base.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ def fragment_cache(cached_hash, non_cached_hash)
7474
# see https://github.com/rails-api/active_model_serializers/pull/965
7575
# When <tt>options</tt> is +nil+, sets it to +{}+
7676
def serialization_options(options)
77-
options ||= {} # rubocop:disable Lint/UselessAssignment
77+
options ||= {}
78+
options.frozen? ? options.dup : options
7879
end
7980

8081
def root

test/action_controller/json_api/linked_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def render_collection_with_include
8888

8989
setup do
9090
@routes = Rails.application.routes.draw do
91-
ActiveSupport::Deprecation.silence do
91+
(Rails.try(:deprecator) || ActiveSupport::Deprecation).silence do
9292
match ':action', to: LinkedTestController, via: [:get, :post]
9393
end
9494
end

test/active_model_serializers/register_jsonapi_renderer_test_isolated.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class WithoutRenderer < JsonApiRendererTest
6666
make_basic_app
6767

6868
Rails.application.routes.draw do
69-
ActiveSupport::Deprecation.silence do
69+
(Rails.try(:deprecator) || ActiveSupport::Deprecation).silence do
7070
match ':action', to: TestController, via: [:get, :post]
7171
end
7272
end
@@ -112,7 +112,7 @@ class WithRenderer < JsonApiRendererTest
112112
make_basic_app
113113

114114
Rails.application.routes.draw do
115-
ActiveSupport::Deprecation.silence do
115+
(Rails.try(:deprecator) || ActiveSupport::Deprecation).silence do
116116
match ':action', to: TestController, via: [:get, :post]
117117
end
118118
end

0 commit comments

Comments
 (0)