Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relax gem requirement to allow Rails 7 #2428

Merged
merged 6 commits into from
Jan 3, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make Rails 7 hack specific to test controller that needs it
  • Loading branch information
Jolyon Pawlyn committed Dec 28, 2021
commit 169d210187746a92b8eb8b703f76f903ee9197d7
7 changes: 6 additions & 1 deletion test/action_controller/serialization_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module Serialization
class ImplicitSerializerTest < ActionController::TestCase
class ImplicitSerializationTestController < ActionController::Base
include SerializationTesting

def render_using_implicit_serializer
@profile = Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
render json: @profile
Expand Down Expand Up @@ -75,8 +76,12 @@ def render_json_array_object_without_serializer
render json: [{ error: 'Result is Invalid' }]
end

# HACK: to prevent the resetting of instance variables after each request in Rails 7
# see https://github.com/rails/rails/pull/43735
def clear_instance_variables_between_requests; end

def update_and_render_object_with_cache_enabled
@post.updated_at = Time.zone.now
@post.updated_at = Time.zone.now # requires hack above to prevent `NoMethodError: undefined method `updated_at=' for nil:NilClass`

generate_cached_serializer(@post)
render json: @post
Expand Down
13 changes: 0 additions & 13 deletions test/support/rails_7_patch.rb

This file was deleted.

1 change: 0 additions & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def silence_warnings

require 'support/rails_app'

require 'support/rails_7_patch'
require 'support/ruby_2_6_rails_4_2_patch'

# require "rails/test_help"
Expand Down