From a25c35252580bdd9f710f1ed01beaa3805316040 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 3 Jul 2013 15:35:56 -0700 Subject: [PATCH] Move models and serializers in test to fixtures.rb file --- test/fixtures.rb | 24 ++++++ .../action_controller/serialization_test.rb | 78 +------------------ test/test_helper.rb | 1 + .../serializer/attributes_test.rb | 14 ---- .../unit/active_model/serializer/root_test.rb | 20 ++--- .../active_model/serializer/scope_test.rb | 13 ---- .../active_model/serializer_support_test.rb | 7 -- 7 files changed, 32 insertions(+), 125 deletions(-) create mode 100644 test/fixtures.rb diff --git a/test/fixtures.rb b/test/fixtures.rb new file mode 100644 index 00000000..4a143013 --- /dev/null +++ b/test/fixtures.rb @@ -0,0 +1,24 @@ +class Model + include ActiveModel::SerializerSupport + + def initialize(hash={}) + @attributes = hash + end + + def read_attribute_for_serialization(name) + @attributes[name] + end +end + +class ModelSerializer < ActiveModel::Serializer + attributes :attr1, :attr2 + + def attr2 + attr2 = object.read_attribute_for_serialization(:attr2) + if scope + attr2 + '-' + scope + else + attr2 + end + end +end diff --git a/test/integration/action_controller/serialization_test.rb b/test/integration/action_controller/serialization_test.rb index 16477c16..037fd19d 100644 --- a/test/integration/action_controller/serialization_test.rb +++ b/test/integration/action_controller/serialization_test.rb @@ -4,22 +4,6 @@ require 'newbase/active_model_serializers' module ActionController module Serialization class ImplicitSerializerTest < ActionController::TestCase - class Model - include ActiveModel::SerializerSupport - - def initialize(hash={}) - @attributes = hash - end - - def read_attribute_for_serialization(name) - @attributes[name] - end - end - - class ModelSerializer < ActiveModel::Serializer - attributes :attr1, :attr2 - end - class MyController < ActionController::Base def render_using_implicit_serializer render :json => Model.new(attr1: 'value1', attr2: 'value2', attr3: 'value3') @@ -36,32 +20,12 @@ module ActionController end class ImplicitSerializerScopeTest < ActionController::TestCase - class Model - include ActiveModel::SerializerSupport - - def initialize(hash={}) - @attributes = hash - end - - def read_attribute_for_serialization(name) - @attributes[name] - end - end - - class ModelSerializer < ActiveModel::Serializer - attributes :attr1, :attr2 - - def attr2 - object.read_attribute_for_serialization(:attr2) + '-' + scope - end - end - class MyController < ActionController::Base def render_using_implicit_serializer_and_scope render :json => Model.new(attr1: 'value1', attr2: 'value2', attr3: 'value3') end - protected + private def current_user 'current_user' @@ -78,26 +42,6 @@ module ActionController end class ExplicitSerializerScopeTest < ActionController::TestCase - class Model - include ActiveModel::SerializerSupport - - def initialize(hash={}) - @attributes = hash - end - - def read_attribute_for_serialization(name) - @attributes[name] - end - end - - class ModelSerializer < ActiveModel::Serializer - attributes :attr1, :attr2 - - def attr2 - object.read_attribute_for_serialization(:attr2) + '-' + scope - end - end - class MyController < ActionController::Base def render_using_implicit_serializer_and_explicit_scope render json: Model.new(attr1: 'value1', attr2: 'value2', attr3: 'value3'), scope: current_admin @@ -124,26 +68,6 @@ module ActionController end class OverridingSerializationScopeTest < ActionController::TestCase - class Model - include ActiveModel::SerializerSupport - - def initialize(hash={}) - @attributes = hash - end - - def read_attribute_for_serialization(name) - @attributes[name] - end - end - - class ModelSerializer < ActiveModel::Serializer - attributes :attr1, :attr2 - - def attr2 - object.read_attribute_for_serialization(:attr2) + '-' + scope - end - end - class MyController < ActionController::Base def render_overriding_serialization_scope render json: Model.new(attr1: 'value1', attr2: 'value2', attr3: 'value3') diff --git a/test/test_helper.rb b/test/test_helper.rb index f5b1f10e..28fd7d53 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,7 @@ require 'bundler/setup' require 'newbase/active_model_serializers' require 'test/unit' +require 'newbase/fixtures' module TestHelper Routes = ActionDispatch::Routing::RouteSet.new diff --git a/test/unit/active_model/serializer/attributes_test.rb b/test/unit/active_model/serializer/attributes_test.rb index 0d4469aa..eba7182f 100644 --- a/test/unit/active_model/serializer/attributes_test.rb +++ b/test/unit/active_model/serializer/attributes_test.rb @@ -4,20 +4,6 @@ require 'newbase/active_model/serializer' module ActiveModel class Serializer class AttributesTest < ActiveModel::TestCase - class Model - def initialize(hash={}) - @attributes = hash - end - - def read_attribute_for_serialization(name) - @attributes[name] - end - end - - class ModelSerializer < ActiveModel::Serializer - attributes :attr1, :attr2 - end - def setup model = Model.new({ :attr1 => 'value1', :attr2 => 'value2', :attr3 => 'value3' }) @model_serializer = ModelSerializer.new(model) diff --git a/test/unit/active_model/serializer/root_test.rb b/test/unit/active_model/serializer/root_test.rb index 36944aab..bf513553 100644 --- a/test/unit/active_model/serializer/root_test.rb +++ b/test/unit/active_model/serializer/root_test.rb @@ -4,24 +4,16 @@ require 'newbase/active_model/serializer' module ActiveModel class Serializer class RootAsOptionTest < ActiveModel::TestCase - class Model - def initialize(hash={}) - @attributes = hash - end - - def read_attribute_for_serialization(name) - @attributes[name] - end - end - - class ModelSerializer < ActiveModel::Serializer - attributes :attr1, :attr2 - end - ModelSerializer.root = true def setup + @old_root = ModelSerializer._root @model = Model.new({ :attr1 => 'value1', :attr2 => 'value2', :attr3 => 'value3' }) @serializer = ModelSerializer.new(@model, root: 'initialize') + ModelSerializer._root = true + end + + def teardown + ModelSerializer._root = @old_root end def test_root_is_not_displayed_using_serializable_hash diff --git a/test/unit/active_model/serializer/scope_test.rb b/test/unit/active_model/serializer/scope_test.rb index 52c1655e..9ec106b6 100644 --- a/test/unit/active_model/serializer/scope_test.rb +++ b/test/unit/active_model/serializer/scope_test.rb @@ -4,19 +4,6 @@ require 'newbase/active_model/serializer' module ActiveModel class Serializer class ScopeTest < ActiveModel::TestCase - class Model - def initialize(hash={}) - @attributes = hash - end - - def read_attribute_for_serialization(name) - @attributes[name] - end - end - - class ModelSerializer < ActiveModel::Serializer - end - def setup @serializer = ModelSerializer.new(nil, scope: current_user) end diff --git a/test/unit/active_model/serializer_support_test.rb b/test/unit/active_model/serializer_support_test.rb index 2ea2e8ac..3db8bdfe 100644 --- a/test/unit/active_model/serializer_support_test.rb +++ b/test/unit/active_model/serializer_support_test.rb @@ -4,13 +4,6 @@ require 'newbase/active_model/serializer_support' module ActiveModel module SerializerSupport class Test < ActiveModel::TestCase - class Model - include ActiveModel::SerializerSupport - end - - class ModelSerializer < ActiveModel::Serializer - end - def test_active_model_returns_its_serializer assert_equal ModelSerializer, Model.new.active_model_serializer end