Use factory_bot to build new model objects

[rails.git] / test / models / relation_test.rb

diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index e3ad13dc71ee4975cce25cbfb9beb7c1fb64ac58..2aaaaed8aedd22ddb512e11e52956eaea51630cd 100644 (file)
--- a/test/models/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -193,10 +193,9 @@ class RelationTest < ActiveSupport::TestCase
     assert_nil changeset.max_lon
     assert_nil changeset.max_lat
     assert_nil changeset.min_lat
-    new_relation = Relation.new
-    new_relation.id = super_relation.id
-    new_relation.version = super_relation.version
-    new_relation.changeset = changeset
+    new_relation = build(:relation, :id => super_relation.id,
+                                    :version => super_relation.version,
+                                    :changeset => changeset)
     new_relation.add_member node_member.member_type, node_member.member_id, node_member.member_role
     # one member(relation type) was removed, so any_relation flag is expected to be true.
     super_relation.update_from(new_relation, user)
@@ -221,10 +220,9 @@ class RelationTest < ActiveSupport::TestCase
     assert_nil changeset.max_lat
     assert_nil changeset.min_lat
 
-    new_relation = Relation.new
-    new_relation.id = orig_relation.id
-    new_relation.version = orig_relation.version
-    new_relation.changeset_id = changeset.id
+    new_relation = build(:relation, :id => orig_relation.id,
+                                    :version => orig_relation.version,
+                                    :changeset_id => changeset.id)
     orig_relation.delete_with_history!(new_relation, user)
     changeset.reload
     assert_equal 39, changeset.min_lon