From c6c514fce7bf591759c159c3d1f88d29d6c01e41 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 9 Mar 2017 11:29:43 +0000 Subject: [PATCH] Take the user from the node or changeset, rather than referring to the fixture. --- test/models/node_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.43.2