Replace fixtures with factory for node_tags

[rails.git] / test / controllers / changeset_controller_test.rb

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index c996bbaab3c2297e8effe87b41158b58b1610721..9c77040fe564b9b1205e9793d795bfe6e69136d1 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -3,7 +3,7 @@ require "changeset_controller"
 
 class ChangesetControllerTest < ActionController::TestCase
   api_fixtures
 
 class ChangesetControllerTest < ActionController::TestCase
   api_fixtures

-  fixtures :changeset_comments, :changesets_subscribers
+  fixtures :changesets_subscribers

 
   ##
   # test all routes which lead to this controller
 
   ##
   # test all routes which lead to this controller


@@ -197,6 +197,7 @@ class ChangesetControllerTest < ActionController::TestCase
     assert_select "osm>changeset>discussion>comment", 0
 
     changeset_id = changesets(:normal_user_closed_change).id
     assert_select "osm>changeset>discussion>comment", 0
 
     changeset_id = changesets(:normal_user_closed_change).id

+    create_list(:changeset_comment, 3, :changeset_id => changeset_id)

 
     get :read, :id => changeset_id, :include_discussion => true
     assert_response :success, "cannot get closed changeset with comments"
 
     get :read, :id => changeset_id, :include_discussion => true
     assert_response :success, "cannot get closed changeset with comments"


@@ -1388,7 +1389,10 @@ EOF
   end
 
   def test_changeset_download
   end
 
   def test_changeset_download

+    tag = create(:old_node_tag, :old_node => nodes(:used_node_2))
+

     get :download, :id => changesets(:normal_user_first_change).id
     get :download, :id => changesets(:normal_user_first_change).id

+

     assert_response :success
     assert_template nil
     # print @response.body
     assert_response :success
     assert_template nil
     # print @response.body


@@ -1396,7 +1400,7 @@ EOF
     assert_select "osmChange[version='#{API_VERSION}'][generator='#{GENERATOR}']" do
       assert_select "create", :count => 5
       assert_select "create>node[id='#{nodes(:used_node_2).node_id}'][visible='#{nodes(:used_node_2).visible?}'][version='#{nodes(:used_node_2).version}']" do
     assert_select "osmChange[version='#{API_VERSION}'][generator='#{GENERATOR}']" do
       assert_select "create", :count => 5
       assert_select "create>node[id='#{nodes(:used_node_2).node_id}'][visible='#{nodes(:used_node_2).visible?}'][version='#{nodes(:used_node_2).version}']" do

-        assert_select "tag[k='#{node_tags(:t3).k}'][v='#{node_tags(:t3).v}']"
+        assert_select "tag[k='#{tag.k}'][v='#{tag.v}']"

       end
       assert_select "create>node[id='#{nodes(:visible_node).node_id}']"
     end
       end
       assert_select "create>node[id='#{nodes(:visible_node).node_id}']"
     end


@@ -2149,7 +2153,7 @@ EOF
   # test hide comment fail
   def test_hide_comment_fail
     # unauthorized
   # test hide comment fail
   def test_hide_comment_fail
     # unauthorized

-    comment = changeset_comments(:normal_comment_1)
+    comment = create(:changeset_comment)

     assert_equal true, comment.visible
 
     post :hide_comment, :id => comment.id
     assert_equal true, comment.visible
 
     post :hide_comment, :id => comment.id


@@ -2174,7 +2178,7 @@ EOF
   ##
   # test hide comment succes
   def test_hide_comment_success
   ##
   # test hide comment succes
   def test_hide_comment_success

-    comment = changeset_comments(:normal_comment_1)
+    comment = create(:changeset_comment)

     assert_equal true, comment.visible
 
     basic_authorization(users(:moderator_user).email, "test")
     assert_equal true, comment.visible
 
     basic_authorization(users(:moderator_user).email, "test")


@@ -2188,7 +2192,7 @@ EOF
   # test unhide comment fail
   def test_unhide_comment_fail
     # unauthorized
   # test unhide comment fail
   def test_unhide_comment_fail
     # unauthorized

-    comment = changeset_comments(:hidden_comment)
+    comment = create(:changeset_comment, :visible => false)

     assert_equal false, comment.visible
 
     post :unhide_comment, :id => comment.id
     assert_equal false, comment.visible
 
     post :unhide_comment, :id => comment.id


@@ -2213,7 +2217,7 @@ EOF
   ##
   # test unhide comment succes
   def test_unhide_comment_success
   ##
   # test unhide comment succes
   def test_unhide_comment_success

-    comment = changeset_comments(:hidden_comment)
+    comment = create(:changeset_comment, :visible => false)

     assert_equal false, comment.visible
 
     basic_authorization(users(:moderator_user).email, "test")
     assert_equal false, comment.visible
 
     basic_authorization(users(:moderator_user).email, "test")


@@ -2226,6 +2230,8 @@ EOF
   ##
   # test comments feed
   def test_comments_feed
   ##
   # test comments feed
   def test_comments_feed

+    create_list(:changeset_comment, 3, :changeset_id => changesets(:normal_user_closed_change).id)
+

     get :comments_feed, :format => "rss"
     assert_response :success
     assert_equal "application/rss+xml", @response.content_type
     get :comments_feed, :format => "rss"
     assert_response :success
     assert_equal "application/rss+xml", @response.content_type