mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-24 23:06:50 +00:00
Refactor TestUser in SerializationScopeNameTest
Use the same base class we use for other test models
This commit is contained in:
parent
90c7005c79
commit
9480b567ef
@ -2,8 +2,6 @@ require 'test_helper'
|
|||||||
require 'pathname'
|
require 'pathname'
|
||||||
|
|
||||||
class DefaultScopeNameTest < ActionController::TestCase
|
class DefaultScopeNameTest < ActionController::TestCase
|
||||||
TestUser = Struct.new(:id, :name, :admin)
|
|
||||||
|
|
||||||
class UserSerializer < ActiveModel::Serializer
|
class UserSerializer < ActiveModel::Serializer
|
||||||
attributes :admin?
|
attributes :admin?
|
||||||
def admin?
|
def admin?
|
||||||
@ -17,11 +15,11 @@ class DefaultScopeNameTest < ActionController::TestCase
|
|||||||
before_filter { request.format = :json }
|
before_filter { request.format = :json }
|
||||||
|
|
||||||
def current_user
|
def current_user
|
||||||
TestUser.new(1, 'Pete', false)
|
User.new(id: 1, name: 'Pete', admin: false)
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_new_user
|
def render_new_user
|
||||||
render json: TestUser.new(1, 'pete', false), serializer: UserSerializer, adapter: :json_api
|
render json: User.new(id: 1, name: 'Pete', admin: false), serializer: UserSerializer, adapter: :json_api
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -29,13 +27,11 @@ class DefaultScopeNameTest < ActionController::TestCase
|
|||||||
|
|
||||||
def test_default_scope_name
|
def test_default_scope_name
|
||||||
get :render_new_user
|
get :render_new_user
|
||||||
assert_equal '{"data":{"admin?":false,"id":"1","type":"test_users"}}', @response.body
|
assert_equal '{"data":{"admin?":false,"id":"1","type":"users"}}', @response.body
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class SerializationScopeNameTest < ActionController::TestCase
|
class SerializationScopeNameTest < ActionController::TestCase
|
||||||
TestUser = Struct.new(:id, :name, :admin)
|
|
||||||
|
|
||||||
class AdminUserSerializer < ActiveModel::Serializer
|
class AdminUserSerializer < ActiveModel::Serializer
|
||||||
attributes :admin?
|
attributes :admin?
|
||||||
def admin?
|
def admin?
|
||||||
@ -50,11 +46,11 @@ class SerializationScopeNameTest < ActionController::TestCase
|
|||||||
before_filter { request.format = :json }
|
before_filter { request.format = :json }
|
||||||
|
|
||||||
def current_admin
|
def current_admin
|
||||||
TestUser.new(1, 'Bob', true)
|
User.new(id: 2, name: 'Bob', admin: true)
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_new_user
|
def render_new_user
|
||||||
render json: TestUser.new(1, 'pete', false), serializer: AdminUserSerializer, adapter: :json_api
|
render json: User.new(id: 1, name: 'Pete', admin: false), serializer: AdminUserSerializer, adapter: :json_api
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -62,6 +58,6 @@ class SerializationScopeNameTest < ActionController::TestCase
|
|||||||
|
|
||||||
def test_override_scope_name_with_controller
|
def test_override_scope_name_with_controller
|
||||||
get :render_new_user
|
get :render_new_user
|
||||||
assert_equal '{"data":{"admin?":true,"id":"1","type":"test_users"}}', @response.body
|
assert_equal '{"data":{"admin?":true,"id":"1","type":"users"}}', @response.body
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
1
test/fixtures/poro.rb
vendored
1
test/fixtures/poro.rb
vendored
@ -63,6 +63,7 @@ Author = Class.new(Model)
|
|||||||
Bio = Class.new(Model)
|
Bio = Class.new(Model)
|
||||||
Blog = Class.new(Model)
|
Blog = Class.new(Model)
|
||||||
Role = Class.new(Model)
|
Role = Class.new(Model)
|
||||||
|
User = Class.new(Model)
|
||||||
module Spam; end
|
module Spam; end
|
||||||
Spam::UnrelatedLink = Class.new(Model)
|
Spam::UnrelatedLink = Class.new(Model)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user