Skip to content

Commit 9480b56

Browse files
committed
Refactor TestUser in SerializationScopeNameTest
Use the same base class we use for other test models
1 parent 90c7005 commit 9480b56

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

test/action_controller/serialization_scope_name_test.rb

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
require 'pathname'
33

44
class DefaultScopeNameTest < ActionController::TestCase
5-
TestUser = Struct.new(:id, :name, :admin)
6-
75
class UserSerializer < ActiveModel::Serializer
86
attributes :admin?
97
def admin?
@@ -17,25 +15,23 @@ class UserTestController < ActionController::Base
1715
before_filter { request.format = :json }
1816

1917
def current_user
20-
TestUser.new(1, 'Pete', false)
18+
User.new(id: 1, name: 'Pete', admin: false)
2119
end
2220

2321
def render_new_user
24-
render json: TestUser.new(1, 'pete', false), serializer: UserSerializer, adapter: :json_api
22+
render json: User.new(id: 1, name: 'Pete', admin: false), serializer: UserSerializer, adapter: :json_api
2523
end
2624
end
2725

2826
tests UserTestController
2927

3028
def test_default_scope_name
3129
get :render_new_user
32-
assert_equal '{"data":{"admin?":false,"id":"1","type":"test_users"}}', @response.body
30+
assert_equal '{"data":{"admin?":false,"id":"1","type":"users"}}', @response.body
3331
end
3432
end
3533

3634
class SerializationScopeNameTest < ActionController::TestCase
37-
TestUser = Struct.new(:id, :name, :admin)
38-
3935
class AdminUserSerializer < ActiveModel::Serializer
4036
attributes :admin?
4137
def admin?
@@ -50,18 +46,18 @@ class AdminUserTestController < ActionController::Base
5046
before_filter { request.format = :json }
5147

5248
def current_admin
53-
TestUser.new(1, 'Bob', true)
49+
User.new(id: 2, name: 'Bob', admin: true)
5450
end
5551

5652
def render_new_user
57-
render json: TestUser.new(1, 'pete', false), serializer: AdminUserSerializer, adapter: :json_api
53+
render json: User.new(id: 1, name: 'Pete', admin: false), serializer: AdminUserSerializer, adapter: :json_api
5854
end
5955
end
6056

6157
tests AdminUserTestController
6258

6359
def test_override_scope_name_with_controller
6460
get :render_new_user
65-
assert_equal '{"data":{"admin?":true,"id":"1","type":"test_users"}}', @response.body
61+
assert_equal '{"data":{"admin?":true,"id":"1","type":"users"}}', @response.body
6662
end
6763
end

test/fixtures/poro.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class ProfilePreviewSerializer < ActiveModel::Serializer
6363
Bio = Class.new(Model)
6464
Blog = Class.new(Model)
6565
Role = Class.new(Model)
66+
User = Class.new(Model)
6667
module Spam; end
6768
Spam::UnrelatedLink = Class.new(Model)
6869

0 commit comments

Comments
 (0)