active_model_serializers 0.9.7 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f73f5aff52f42003b604fcc209782d1b074eb9a
-  data.tar.gz: 0fce31e1d5f8f01da8c0c9d70c30fee124dc87ff
+SHA256:
+  metadata.gz: a8649ea9bfdefabb0215cc90a6a47a87d902573ecd0e2c73b6142c9cefe17825
+  data.tar.gz: 420e8afdc1ba7cbaaab42d7f8f36c3e10b702587cc7484e270428ded2eeccbdd
 SHA512:
-  metadata.gz: 983ed0d1faf8a9e4cb9cf65e4d71fdc5064016e42190a81aa96f73a37e1e342eecead421ebe69c04cca27db142a622eb966e9fc04b79cc152af5b744d6f97812
-  data.tar.gz: 97accf62bff15dc099483199c8ca58c974fc2ee227f64bdbd10223924cdbaa923d4fb59c5ea5a8973fb5612c50e8ef9abf50f300cc8b6f64b80dd9b3a181829f
+  metadata.gz: 237f372c6dd5e73cb7d5f944d90918a23e6acf0f7aa137f0e2972a275445a549a6cf4ffd9e410386c611e89e1dc0137d5451c6d61702d6c6381e43a41e3434ac
+  data.tar.gz: 5d009500e9e616e7d1a7f83adaf7874022f1f039594983e923ef82d4b8f6b8f6268259404b097545a27512b149ec22c8e113a8c0bb51effbef3c0fdd728d7973

data/CHANGELOG.md

@@ -1,6 +1,46 @@
 ## 0.09.x
 
-### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.7...0-9-stable)
+### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.13...0-9-stable)
+
+### [v0.9.13 (2024-09-17)](https://github.com/rails-api/active_model_serializers/compare/v0.9.12...v0.9.13)
+
+- Perf
+  - [#2471](https://github.com/rails-api/active_model_serializers/pull/2471) Generate better attribute accessors, that also don't trigger warnings when redefined. (@byroot)
+
+### [v0.9.12 (2024-04-11)](https://github.com/rails-api/active_model_serializers/compare/v0.9.11...v0.9.12)
+
+- Fix
+  - [#2468](https://github.com/rails-api/active_model_serializers/pull/2468) Fix bug introduced in v0.9.9. Revert "Allow serializer_for to accept String instead of just class objects". (@byroot)
+- Perf
+  - [#2466](https://github.com/rails-api/active_model_serializers/pull/2466) Prefer `defined?` to `Object.constants.include?` (@byroot)
+  - [#2467](https://github.com/rails-api/active_model_serializers/pull/2467) Lazily compute possible serializer class names (@byroot)
+- Chore
+  - [#2469](https://github.com/rails-api/active_model_serializers/pull/2469) Fix various warnings in the test suite (@byroot)
+
+### [v0.9.11 (2024-04-09)](https://github.com/rails-api/active_model_serializers/compare/v0.9.10...v0.9.11)
+
+v0.9.10 was built with an extra file included and so was yanked.
+v0.9.11 is the same as v0.9.10 but doesn't have the extra file.
+
+### [v0.9.10 (2024-04-09)](https://github.com/rails-api/active_model_serializers/compare/v0.9.9...v0.9.10)
+
+- Fix
+  - [#2464](https://github.com/rails-api/active_model_serializers/pull/2464) Do not load ActionController::TestCase in production (@byroot)
+- Perf
+  - [#2465](https://github.com/rails-api/active_model_serializers/pull/2465) Make compatible with enable-frozen-string-literal (@byroot)
+  - [#2463](https://github.com/rails-api/active_model_serializers/pull/2463) Shape Friendly ActionController:Serialization (@byroot)
+- Chore
+  - [#2462](https://github.com/rails-api/active_model_serializers/pull/2462]) Rails 7.1, Ruby 3.3 compat (@byroot)
+- Test
+  - [#2447](https://github.com/rails-api/active_model_serializers/pull/2447) Configure CI on GitHub actoins (@Physium)
+
+### [v0.9.9 (2023-05-18)](https://github.com/rails-api/active_model_serializers/compare/v0.9.8...v0.9.8)
+
+- [#2446](https://github.com/rails-api/active_model_serializers/pull/2446) Fix Ruby > 2.5 constant lookup. (@Physium)
+
+### [v0.9.8 (2020-12-10)](https://github.com/rails-api/active_model_serializers/compare/v0.9.7...v0.9.8)
+
+- [#2373](https://github.com/rails-api/active_model_serializers/pull/2373) Fix Rails 6.0 deprecation warnings. (@supremebeing7)
 
 ### [v0.9.7 (2017-05-01)](https://github.com/rails-api/active_model_serializers/compare/v0.9.6...v0.9.7)
 

data/README.md

@@ -85,7 +85,7 @@ it exists, use it to serialize the `Post`.
 
 This also works with `respond_with`, which uses `to_json` under the hood. Also
 note that any options passed to `render :json` will be passed to your
-serializer and available as `@options` inside.
+serializer and available as `@serialization_options` inside.
 
 To specify a custom serializer for an object, you can specify the
 serializer when you render the object:

data/lib/action_controller/serialization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 
 module ActionController
@@ -45,6 +47,12 @@ module ActionController
       end
     end
 
+    def initialize(*)
+      super
+      @namespace_for_serializer = nil
+    end
+    ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
+
     [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
       define_method renderer_method do |resource, options|
         serializer = build_json_serializer(resource, options)
@@ -60,7 +68,16 @@ module ActionController
     private
 
     def namespace_for_serializer
-      @namespace_for_serializer ||= self.class.parent unless self.class.parent == Object
+      @namespace_for_serializer ||= namespace_for_class(self.class)
+      @namespace_for_serializer unless @namespace_for_serializer == Object
+    end
+
+    def namespace_for_class(klass)
+      if Module.method_defined?(:module_parent)
+        klass.module_parent
+      else
+        klass.parent
+      end
     end
 
     def default_serializer(resource)

data/lib/action_controller/serialization_test_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionController
   module SerializationAssertions
     extend ActiveSupport::Concern
@@ -24,6 +26,7 @@ module ActionController
       @serializers = Hash.new(0)
       super
     end
+    ruby2_keywords :process if respond_to?(:ruby2_keywords, true)
 
     # Asserts that the request was rendered with the appropriate serializers.
     #

data/lib/active_model/array_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/default_serializer'
 require 'active_model/serializable'
 

data/lib/active_model/default_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/serializable'
 
 module ActiveModel

data/lib/active_model/serializable/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Serializable
     module Utils

data/lib/active_model/serializable.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'active_model/serializable/utils'
 
 module ActiveModel
   module Serializable
-    INSTRUMENTATION_KEY = '!serialize.active_model_serializers'.freeze
+    INSTRUMENTATION_KEY = '!serialize.active_model_serializers'
 
     def self.included(base)
       base.extend Utils

data/lib/active_model/serializer/association/has_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
     class Association

data/lib/active_model/serializer/association/has_one.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
     class Association

data/lib/active_model/serializer/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/default_serializer'
 require 'active_model/serializer/association/has_one'
 require 'active_model/serializer/association/has_many'
@@ -7,9 +9,7 @@ module ActiveModel
     class Association
       def initialize(name, options={})
         if options.has_key?(:include)
-          ActiveSupport::Deprecation.warn <<-WARN
-** Notice: include was renamed to embed_in_root. **
-          WARN
+          ActiveSupport::Deprecation.warn("** Notice: include was renamed to embed_in_root. **")
         end
 
         @name          = name.to_s

data/lib/active_model/serializer/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
     class Config

data/lib/active_model/serializer/generators/resource_override.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/rails/resource/resource_generator'
 

data/lib/active_model/serializer/generators/serializer/scaffold_controller_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 

data/lib/active_model/serializer/generators/serializer/serializer_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Generators
     class SerializerGenerator < NamedBase

data/lib/active_model/serializer/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Railtie < Rails::Railtie
     initializer 'generators' do |app|

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
-    VERSION = '0.9.7'
+    VERSION = '0.9.13'
   end
 end

data/lib/active_model/serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/array_serializer'
 require 'active_model/serializable'
 require 'active_model/serializer/association'
@@ -60,16 +62,19 @@ end
         if resource.respond_to?(:serializer_class)
           resource.serializer_class
         elsif resource.respond_to?(:to_ary)
-          if Object.constants.include?(:ArraySerializer)
+          if defined?(::ArraySerializer)
             ::ArraySerializer
           else
             ArraySerializer
           end
         else
-          klass_name = build_serializer_class(resource, options)
-          Serializer.serializers_cache.fetch_or_store(klass_name) do
-            _const_get(klass_name)
+          each_possible_serializer(resource, options) do |klass_name|
+            serializer = Serializer.serializers_cache.fetch_or_store(klass_name) do
+              _const_get(klass_name)
+            end
+            return serializer unless serializer.nil?
           end
+          nil
         end
       end
 
@@ -85,15 +90,27 @@ end
       end
 
       def attributes(*attrs)
+        # Use `class_eval` rather than `define_method` for faster access
+        # and avoid retaining objects in the closure.
+        # Batch all methods in a single `class_eval` for efficiceny,
+        # and define all methods on the same line so the eventual backtrace
+        # properly maps to the `attributes` call.
+        source = ["# frozen_string_literal: true\n"]
         attrs.each do |attr|
           striped_attr = strip_attribute attr
 
           @_attributes << striped_attr
 
-          define_method striped_attr do
-            object.read_attribute_for_serialization attr
-          end unless method_defined?(attr)
+          unless method_defined?(attr)
+            source <<
+            "def #{striped_attr}" <<
+              "object.read_attribute_for_serialization(#{attr.inspect})" <<
+            "end" <<
+            "alias_method :#{striped_attr}, :#{striped_attr}" # suppress method redefinition warning
+          end
         end
+        caller = caller_locations(1, 1).first
+        class_eval(source.join(";"), caller.path, caller.lineno - 1)
       end
 
       def has_one(*attrs)
@@ -118,12 +135,17 @@ end
         attr
       end
 
+      def each_possible_serializer(resource, options)
+        yield build_serializer_class(resource, options)
+        yield build_serializer_class(resource, {})
+        yield build_serializer_class(resource.class.name.demodulize, {})
+      end
+
       def build_serializer_class(resource, options)
-        "".tap do |klass_name|
-          klass_name << "#{options[:namespace]}::" if options[:namespace]
-          klass_name << options[:prefix].to_s.classify if options[:prefix]
-          klass_name << "#{resource.class.name}Serializer"
-        end
+        klass_name = +""
+        klass_name << "#{options[:namespace]}::" if options[:namespace]
+        klass_name << options[:prefix].to_s.classify if options[:prefix]
+        klass_name << "#{resource.class.name}Serializer"
       end
 
       def associate(klass, *attrs)
@@ -153,7 +175,8 @@ end
       @context       = options[:context]
       @namespace     = options[:namespace]
     end
-    attr_accessor :object, :scope, :root, :meta_key, :meta, :key_format, :context, :polymorphic
+    attr_accessor :object, :scope, :root, :meta_key, :meta, :context, :polymorphic
+    attr_writer :key_format
 
     def json_key
       key = if root == true || root.nil?

data/lib/active_model/serializer_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module SerializerSupport
     alias read_attribute_for_serialization send

data/lib/active_model_serializers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model'
 require 'active_model/serializer'
 require 'active_model/serializer_support'
@@ -7,12 +9,22 @@ require 'active_model/serializer/railtie' if defined?(Rails)
 begin
   require 'action_controller'
   require 'action_controller/serialization'
-  require 'action_controller/serialization_test_case'
 
   ActiveSupport.on_load(:action_controller) do
     if ::ActionController::Serialization.enabled
       ActionController::Base.send(:include, ::ActionController::Serialization)
-      ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
+
+      # action_controller_test_case load hook was added in Rails 5.1
+      # https://github.com/rails/rails/commit/0510208dd1ff23baa619884c0abcae4d141fae53
+      if ActiveSupport::VERSION::STRING < '5.1'
+        require 'action_controller/serialization_test_case'
+        ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
+      else
+        ActiveSupport.on_load(:action_controller_test_case) do
+          require 'action_controller/serialization_test_case'
+          ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
+        end
+      end
     end
   end
 rescue LoadError

data/test/fixtures/poro.rb

@@ -18,6 +18,19 @@ end
 ###
 ## Models
 ###
+
+module TestNamespace2
+  class Test < Model
+    attr_writer :sub_test
+
+    def sub_test
+      @sub_test ||= TestNamespace2::SubTest.new(name: 'N1', description: 'D1')
+    end
+  end
+
+  class SubTest < Model; end
+end
+
 class User < Model
   def profile
     @profile ||= Profile.new(name: 'N1', description: 'D1')
@@ -101,6 +114,24 @@ end
 ###
 ## Serializers
 ###
+
+module TestNamespace2
+  class TestSerializer < ActiveModel::Serializer
+    attributes :name, :email
+
+    has_one :sub_test
+  end
+
+  class SubTestSerializer < ActiveModel::Serializer
+    def description
+      description = object.read_attribute_for_serialization(:description)
+      scope ? "#{description} - #{scope}" : description
+    end
+
+    attributes :name, :description
+  end
+end
+
 class UserSerializer < ActiveModel::Serializer
   attributes :name, :email
 
@@ -113,14 +144,14 @@ end
 
 class SelfReferencingUserParentSerializer < ActiveModel::Serializer
   attributes :name
-  has_one :type, serializer: TypeSerializer, embed: :ids, include: true
+  has_one :type, serializer: TypeSerializer, embed: :ids, embed_in_root: true
 end
 
 class SelfReferencingUserSerializer < ActiveModel::Serializer
   attributes :name
 
-  has_one :type, serializer: TypeSerializer, embed: :ids, include: true
-  has_one :parent, serializer: SelfReferencingUserSerializer, embed: :ids, include: true
+  has_one :type, serializer: TypeSerializer, embed: :ids, embed_in_root: true
+  has_one :parent, serializer: SelfReferencingUserSerializer, embed: :ids, embed_in_root: true
 end
 
 class UserInfoSerializer < ActiveModel::Serializer
@@ -145,6 +176,7 @@ end
 class PostSerializer < ActiveModel::Serializer
   attributes :title, :body
 
+  alias_method :title, :title # silence method redefinition warning
   def title
     keyword = serialization_options[:highlight_keyword]
     title = object.read_attribute_for_serialization(:title)

data/test/integration/action_controller/serialization_test.rb

@@ -13,7 +13,7 @@ module ActionController
 
       def test_render_using_implicit_serializer
         get :render_using_implicit_serializer
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1"}}', @response.body
       end
     end
@@ -35,7 +35,7 @@ module ActionController
 
       def test_render_using_implicit_serializer_and_scope
         get :render_using_implicit_serializer_and_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_user"}}', @response.body
       end
     end
@@ -65,7 +65,7 @@ module ActionController
 
       def test_render_using_scope_set_in_default_serializer_options
         get :render_using_scope_set_in_default_serializer_options
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_admin"}}', @response.body
       end
     end
@@ -91,7 +91,7 @@ module ActionController
 
       def test_render_using_implicit_serializer_and_explicit_scope
         get :render_using_implicit_serializer_and_explicit_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_admin"}}', @response.body
       end
     end
@@ -117,7 +117,7 @@ module ActionController
 
       def test_render_overriding_serialization_scope
         get :render_overriding_serialization_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_admin"}}', @response.body
       end
     end
@@ -141,7 +141,7 @@ module ActionController
 
       def test_render_calling_serialization_scope
         get :render_calling_serialization_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_user"}}', @response.body
       end
     end
@@ -157,7 +157,7 @@ module ActionController
 
       def test_render_using_json_dump
         get :render_using_json_dump
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"hello":"world"}', @response.body
       end
     end
@@ -173,7 +173,7 @@ module ActionController
 
       def test_render_using_rails_behavior
         get :render_using_rails_behavior
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '[{"attributes":{"name":"Name 1","description":"Description 1","comments":"Comments 1"}}]', @response.body
       end
     end
@@ -189,7 +189,7 @@ module ActionController
 
       def test_render_array
         get :render_array
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"my":[{"name":"Name 1","description":"Description 1"}]}', @response.body
       end
     end
@@ -205,7 +205,7 @@ module ActionController
 
       def test_render_array
         get :render_array
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"webLog":[{"name":"Name 1","displayName":"Display Name 1"},{"name":"Name 2","displayName":"Display Name 2"}]}', @response.body
       end
     end
@@ -223,7 +223,7 @@ module ActionController
 
       def test_render_without_root
         get :render_without_root
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"name":"Name 1","displayName":"Display Name 1"}', @response.body
       end
     end
@@ -242,7 +242,7 @@ module ActionController
 
       def test_render_array_without_root
         get :render_array_without_root
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '[{"name":"Name 1","displayName":"Display Name 1"},{"name":"Name 2","displayName":"Display Name 2"}]', @response.body
       end
     end
@@ -278,7 +278,7 @@ module ActionController
         @association.embed_in_root = true
 
         get :render_array_embeding_in_root
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
 
         assert_equal("{\"my\":[{\"name\":\"Name 1\",\"email\":\"mail@server.com\",\"profile_id\":#{@controller.user.profile.object_id}}],\"profiles\":[{\"name\":\"N1\",\"description\":\"D1\"}]}", @response.body)
       end

data/test/integration/action_controller/serialization_test_case_test.rb

@@ -9,7 +9,7 @@ module ActionController
         end
 
         def render_text
-          render text: 'ok'
+          render plain: 'ok'
         end
 
         def render_template

data/test/integration/generators/scaffold_controller_generator_test.rb

@@ -17,44 +17,44 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
 
     assert_file 'app/controllers/accounts_controller.rb' do |content|
       assert_instance_method :index, content do |m|
-        assert_match /@accounts = Account\.all/, m
-        assert_match /format.html/, m
-        assert_match /format.json \{ render json: @accounts \}/, m
+        assert_match(/@accounts = Account\.all/, m)
+        assert_match(/format.html/, m)
+        assert_match(/format.json \{ render json: @accounts \}/, m)
       end
 
       assert_instance_method :show, content do |m|
-        assert_match /format.html/, m
-        assert_match /format.json \{ render json: @account \}/, m
+        assert_match(/format.html/, m)
+        assert_match(/format.json \{ render json: @account \}/, m)
       end
 
       assert_instance_method :new, content do |m|
-        assert_match /@account = Account\.new/, m
+        assert_match(/@account = Account\.new/, m)
       end
 
       assert_instance_method :edit, content do |m|
-        assert m.blank?
+        assert_predicate m, :blank?
       end
 
       assert_instance_method :create, content do |m|
-        assert_match /@account = Account\.new\(account_params\)/, m
-        assert_match /@account\.save/, m
-        assert_match /format\.html \{ redirect_to @account, notice: 'Account was successfully created\.' \}/, m
-        assert_match /format\.json \{ render json: @account, status: :created \}/, m
-        assert_match /format\.html \{ render action: 'new' \}/, m
-        assert_match /format\.json \{ render json: @account\.errors, status: :unprocessable_entity \}/, m
+        assert_match(/@account = Account\.new\(account_params\)/, m)
+        assert_match(/@account\.save/, m)
+        assert_match(/format\.html \{ redirect_to @account, notice: 'Account was successfully created\.' \}/, m)
+        assert_match(/format\.json \{ render json: @account, status: :created \}/, m)
+        assert_match(/format\.html \{ render action: 'new' \}/, m)
+        assert_match(/format\.json \{ render json: @account\.errors, status: :unprocessable_entity \}/, m)
       end
 
       assert_instance_method :update, content do |m|
-        assert_match /format\.html \{ redirect_to @account, notice: 'Account was successfully updated\.' \}/, m
-        assert_match /format\.json \{ head :no_content \}/, m
-        assert_match /format\.html \{ render action: 'edit' \}/, m
-        assert_match /format\.json \{ render json: @account.errors, status: :unprocessable_entity \}/, m
+        assert_match(/format\.html \{ redirect_to @account, notice: 'Account was successfully updated\.' \}/, m)
+        assert_match(/format\.json \{ head :no_content \}/, m)
+        assert_match(/format\.html \{ render action: 'edit' \}/, m)
+        assert_match(/format\.json \{ render json: @account.errors, status: :unprocessable_entity \}/, m)
       end
 
       assert_instance_method :destroy, content do |m|
-        assert_match /@account\.destroy/, m
-        assert_match /format\.html { redirect_to accounts_url \}/, m
-        assert_match /format\.json \{ head :no_content \}/, m
+        assert_match(/@account\.destroy/, m)
+        assert_match(/format\.html { redirect_to accounts_url \}/, m)
+        assert_match(/format\.json \{ head :no_content \}/, m)
       end
 
       assert_match(/def account_params/, content)