Use changeset factory for factory associations

One test needed updating since it assumed the comments were being
created on a particular changeset.

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index 19f60035b89dc9fcc91b29315a794dbdf6be2328..567fc0576cabe29b7ba05173b9433748832feceb 100644 (file)
--- 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 d12c1b653c391f2c8d94ccd597ad38d27ae7980e..04644580fd30eda3d43446e4f48707e885fe28a0 100644 (file)
--- 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 ecf096ecad11035fc848c5ea33975552968e9f17..403ffc0ea04b539c0ad2b4a5fea8463104c5b77d 100644 (file)
--- 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