Skip to content

Commit

Permalink
Use the Test namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
maurogeorge committed Dec 3, 2015
1 parent 7fd24b0 commit 2cae7ac
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 18 deletions.
8 changes: 0 additions & 8 deletions lib/active_model/serializable_resource.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def initialize(resource, options = {})
@resource = resource
@adapter_opts, @serializer_opts =
options.partition { |k, _| ADAPTER_OPTION_KEYS.include? k }.map { |h| Hash[h] }
notify_active_support
end

def serialization_scope=(scope)
Expand Down Expand Up @@ -68,13 +67,6 @@ def serializer?

protected

def notify_active_support
return unless serializer?
event_name = 'serialize.active_model_serializers'
payload = { serializer: serializer.name }
ActiveSupport::Notifications.instrument(event_name, payload)
end

attr_reader :resource, :adapter_opts, :serializer_opts
end
end
2 changes: 2 additions & 0 deletions lib/active_model/serializer/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ class Railtie < Rails::Railtie
app.load_generators
require 'generators/serializer/resource_override'
end

ActionController::TestCase.send(:include, ActiveModelSerializers::Test::Serializer)
end
end
3 changes: 1 addition & 2 deletions lib/active_model_serializers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def silence_warnings
require 'active_model/serializer'
require 'active_model/serializable_resource'
require 'active_model/serializer/version'
require 'active_model/serializer/assertions'
require 'active_model_serializers/test/serializer'

require 'action_controller/serialization'
ActiveSupport.on_load(:action_controller) do
Expand All @@ -60,7 +60,6 @@ def silence_warnings
ActionDispatch::Reloader.to_prepare do
ActiveModel::Serializer.serializers_cache.clear
end
ActionController::TestCase.send(:include, ActiveModel::Serializer::Assertions)
end

require 'active_model/serializer/railtie'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module ActiveModel
class Serializer
module Assertions
module ActiveModelSerializers
module Test
module Serializer
extend ActiveSupport::Concern

included do
Expand Down Expand Up @@ -60,7 +60,7 @@ def assert_serializer(expectation, message = nil)
def setup_serialization_subscriptions
@serializers = []
ActiveSupport::Notifications.subscribe(event_name) do |_name, _start, _finish, _id, payload|
serializer = payload[:serializer]
serializer = payload[:serializer].name
serializers << serializer
end
end
Expand All @@ -70,7 +70,7 @@ def teardown_serialization_subscriptions
end

def event_name
'serialize.active_model_serializers'
'render.active_model_serializers'
end

def matches_class?(expectation)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require 'test_helper'

module ActiveModel
class Serializer
class AssertionsTest < ActionController::TestCase
module ActiveModelSerializers
module Test
class SerializerTest < ActionController::TestCase
class MyController < ActionController::Base
def render_using_serializer
render json: Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
Expand Down

0 comments on commit 2cae7ac

Please sign in to comment.