Skip to content

Commit 28bcda4

Browse files
committed
Rename UserSerializer to DefaultUserSerializer in tests.
1 parent 7fcc8c0 commit 28bcda4

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

activemodel/test/cases/serializer_test.rb

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ def active_model_serializer; CommentSerializer; end
4444

4545
class UserSerializer < ActiveModel::Serializer
4646
attributes :first_name, :last_name
47-
end
48-
49-
class User2Serializer < ActiveModel::Serializer
50-
attributes :first_name, :last_name
5147

5248
def serializable_hash
5349
attributes.merge(:ok => true).merge(scope)
5450
end
5551
end
5652

53+
class DefaultUserSerializer < ActiveModel::Serializer
54+
attributes :first_name, :last_name
55+
end
56+
5757
class MyUserSerializer < ActiveModel::Serializer
5858
attributes :first_name, :last_name
5959

@@ -85,34 +85,34 @@ class PostSerializer < ActiveModel::Serializer
8585

8686
def test_attributes
8787
user = User.new
88-
user_serializer = UserSerializer.new(user, nil)
88+
user_serializer = DefaultUserSerializer.new(user, {})
8989

9090
hash = user_serializer.as_json
9191

9292
assert_equal({
93-
:user => { :first_name => "Jose", :last_name => "Valim" }
93+
:default_user => { :first_name => "Jose", :last_name => "Valim" }
9494
}, hash)
9595
end
9696

9797
def test_attributes_method
9898
user = User.new
99-
user_serializer = User2Serializer.new(user, {})
99+
user_serializer = UserSerializer.new(user, {})
100100

101101
hash = user_serializer.as_json
102102

103103
assert_equal({
104-
:user2 => { :first_name => "Jose", :last_name => "Valim", :ok => true }
104+
:user => { :first_name => "Jose", :last_name => "Valim", :ok => true }
105105
}, hash)
106106
end
107107

108108
def test_serializer_receives_scope
109109
user = User.new
110-
user_serializer = User2Serializer.new(user, {:scope => true})
110+
user_serializer = UserSerializer.new(user, {:scope => true})
111111

112112
hash = user_serializer.as_json
113113

114114
assert_equal({
115-
:user2 => {
115+
:user => {
116116
:first_name => "Jose",
117117
:last_name => "Valim",
118118
:ok => true,
@@ -419,15 +419,13 @@ def test_embed_objects
419419
def test_array_serializer
420420
model = Model.new
421421
user = User.new
422-
post = Post.new(:title => "New Post", :body => "Body of new post", :email => "[email protected]")
423422
comments = Comment.new(:title => "Comment1", :id => 1)
424-
post.comments = []
425423

426-
array = [model, post, comments]
427-
serializer = array.active_model_serializer.new(array, user)
424+
array = [model, user, comments]
425+
serializer = array.active_model_serializer.new(array, {:scope => true})
428426
assert_equal([
429427
{ :model => "Model" },
430-
{ :post => { :body => "Body of new post", :comments => [], :title => "New Post" } },
428+
{ :user => { :last_name=>"Valim", :ok=>true, :first_name=>"Jose", :scope => true } },
431429
{ :comment => { :title => "Comment1" } }
432430
], serializer.as_json)
433431
end

0 commit comments

Comments
 (0)