Fixed existing tests

[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 5b1dfdbe43afb7c062f5c2f0c975f85199d47c63..ecccb1f5f3b1feadbc74e00c055489ccdef32c87 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -1181,8 +1181,7 @@ EOF
     ["<osmChange/>",
      "<osmChange></osmChange>",
      "<osmChange><modify/></osmChange>",
     ["<osmChange/>",
      "<osmChange></osmChange>",
      "<osmChange><modify/></osmChange>",

-     "<osmChange><modify></modify></osmChange>"
-    ].each do |diff|
+     "<osmChange><modify></modify></osmChange>"].each do |diff|

       # upload it
       content diff
       post :upload, :id => changesets(:public_user_first_change).id
       # upload it
       content diff
       post :upload, :id => changesets(:public_user_first_change).id


@@ -1598,8 +1597,7 @@ EOF
   def test_query_invalid
     ["abracadabra!",
      "1,2,3,F",
   def test_query_invalid
     ["abracadabra!",
      "1,2,3,F",

-     ";drop table users;"
-    ].each do |bbox|
+     ";drop table users;"].each do |bbox|

       get :query, :bbox => bbox
       assert_response :bad_request, "'#{bbox}' isn't a bbox"
     end
       get :query, :bbox => bbox
       assert_response :bad_request, "'#{bbox}' isn't a bbox"
     end


@@ -1608,8 +1606,7 @@ EOF
      "00-00-00",
      ";drop table users;",
      ",",
      "00-00-00",
      ";drop table users;",
      ",",

-     "-,-"
-    ].each do |time|
+     "-,-"].each do |time|

       get :query, :time => time
       assert_response :bad_request, "'#{time}' isn't a valid time range"
     end
       get :query, :time => time
       assert_response :bad_request, "'#{time}' isn't a valid time range"
     end


@@ -1617,8 +1614,7 @@ EOF
     ["me",
      "foobar",
      "-1",
     ["me",
      "foobar",
      "-1",

-     "0"
-    ].each do |uid|
+     "0"].each do |uid|

       get :query, :user => uid
       assert_response :bad_request, "'#{uid}' isn't a valid user ID"
     end
       get :query, :user => uid
       assert_response :bad_request, "'#{uid}' isn't a valid user ID"
     end


@@ -2339,10 +2335,11 @@ EOF
     assert changesets.size <= 20
 
     assert_select "feed", :count => [changesets.size, 1].min do
     assert changesets.size <= 20
 
     assert_select "feed", :count => [changesets.size, 1].min do

-      assert_select "entry", :count => changesets.size
+      assert_select "> title", :count => 1, :text => /^Changesets/
+      assert_select "> entry", :count => changesets.size

 
       changesets.each do |changeset|
 
       changesets.each do |changeset|

-        assert_select "entry > id", changeset_url(:id => changeset.id)
+        assert_select "> entry > id", changeset_url(:id => changeset.id)

       end
     end
   end
       end
     end
   end