From 24cd3af31e3d82b3ed203ae8e58218dd2eab5b21 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 22 Mar 2017 11:09:52 +0000 Subject: [PATCH] Use changeset factory for factory associations One test needed updating since it assumed the comments were being created on a particular changeset. --- test/controllers/browse_controller_test.rb | 9 +++++---- test/factories/changeset_comments.rb | 3 +-- test/factories/old_node.rb | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index 19f60035b..567fc0576 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -75,15 +75,16 @@ class BrowseControllerTest < ActionController::TestCase end def test_read_changeset_hidden_comments - create_list(:changeset_comment, 3) - create(:changeset_comment, :visible => false) + changeset = create(:changeset) + create_list(:changeset_comment, 3, :changeset => changeset) + create(:changeset_comment, :visible => false, :changeset => changeset) - browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset" + browse_check "changeset", changeset.id, "browse/changeset" assert_select "div.changeset-comments ul li", :count => 3 session[:user] = create(:moderator_user).id - browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset" + browse_check "changeset", changeset.id, "browse/changeset" assert_select "div.changeset-comments ul li", :count => 4 end diff --git a/test/factories/changeset_comments.rb b/test/factories/changeset_comments.rb index d12c1b653..04644580f 100644 --- a/test/factories/changeset_comments.rb +++ b/test/factories/changeset_comments.rb @@ -3,8 +3,7 @@ FactoryGirl.define do sequence(:body) { |n| "Changeset comment #{n}" } visible true - # FIXME: needs changeset factory - changeset_id 3 + changeset association :author, :factory => :user end diff --git a/test/factories/old_node.rb b/test/factories/old_node.rb index ecf096eca..403ffc0ea 100644 --- a/test/factories/old_node.rb +++ b/test/factories/old_node.rb @@ -3,8 +3,7 @@ FactoryGirl.define do latitude 1 * GeoRecord::SCALE longitude 1 * GeoRecord::SCALE - # FIXME: needs changeset factory - changeset_id 1 + changeset # FIXME: needs node factory node_id 1000 -- 2.43.2