From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 9 Mar 2017 11:29:43 +0000 (+0000)
Subject: Take the user from the node or changeset, rather than referring to the fixture.
X-Git-Tag: live~3561^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c6c514fce7bf591759c159c3d1f88d29d6c01e41

Take the user from the node or changeset, rather than referring to the fixture.
---

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 7d43362d2..85bdfc995 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -84,7 +84,7 @@ class NodeTest < ActiveSupport::TestCase
       :visible => 1,
       :version => 1
     )
-    assert node_template.create_with_history(users(:normal_user))
+    assert node_template.create_with_history(changesets(:normal_user_first_change).user)
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -116,7 +116,7 @@ class NodeTest < ActiveSupport::TestCase
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
     # node_template.tags = "updated=yes"
-    assert node.update_from(node_template, users(:normal_user))
+    assert node.update_from(node_template, current_nodes(:visible_node).changeset.user)
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -144,7 +144,7 @@ class NodeTest < ActiveSupport::TestCase
     node = Node.find(node_template.id)
     assert_not_nil node
 
-    assert node.delete_with_history!(node_template, users(:normal_user))
+    assert node.delete_with_history!(node_template, current_nodes(:visible_node).changeset.user)
 
     node = Node.find(node_template.id)
     assert_not_nil node