X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d99374434e43c2434878f0ce79bca0ebeafcef57..600ed78b04a94fcc5bb80f6c9a9b872bfd9e9c53:/test/controllers/api/notes_controller_test.rb

diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb
index 5f449f0d6..31c55b3a8 100644
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -1,8 +1,9 @@
 require "test_helper"
 
 module Api
-  class NotesControllerTest < ActionController::TestCase
+  class NotesControllerTest < ActionDispatch::IntegrationTest
     def setup
+      super
       # Stub nominatim response for note locations
       stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
         .to_return(:status => 404)
@@ -13,11 +14,11 @@ module Api
     def test_routes
       assert_routing(
         { :path => "/api/0.6/notes", :method => :post },
-        { :controller => "api/notes", :action => "create", :format => "xml" }
+        { :controller => "api/notes", :action => "create" }
       )
       assert_routing(
         { :path => "/api/0.6/notes/1", :method => :get },
-        { :controller => "api/notes", :action => "show", :id => "1", :format => "xml" }
+        { :controller => "api/notes", :action => "show", :id => "1" }
       )
       assert_recognizes(
         { :controller => "api/notes", :action => "show", :id => "1", :format => "xml" },
@@ -37,24 +38,24 @@ module Api
       )
       assert_routing(
         { :path => "/api/0.6/notes/1/comment", :method => :post },
-        { :controller => "api/notes", :action => "comment", :id => "1", :format => "xml" }
+        { :controller => "api/notes", :action => "comment", :id => "1" }
       )
       assert_routing(
         { :path => "/api/0.6/notes/1/close", :method => :post },
-        { :controller => "api/notes", :action => "close", :id => "1", :format => "xml" }
+        { :controller => "api/notes", :action => "close", :id => "1" }
       )
       assert_routing(
         { :path => "/api/0.6/notes/1/reopen", :method => :post },
-        { :controller => "api/notes", :action => "reopen", :id => "1", :format => "xml" }
+        { :controller => "api/notes", :action => "reopen", :id => "1" }
       )
       assert_routing(
         { :path => "/api/0.6/notes/1", :method => :delete },
-        { :controller => "api/notes", :action => "destroy", :id => "1", :format => "xml" }
+        { :controller => "api/notes", :action => "destroy", :id => "1" }
       )
 
       assert_routing(
         { :path => "/api/0.6/notes", :method => :get },
-        { :controller => "api/notes", :action => "index", :format => "xml" }
+        { :controller => "api/notes", :action => "index" }
       )
       assert_recognizes(
         { :controller => "api/notes", :action => "index", :format => "xml" },
@@ -75,7 +76,7 @@ module Api
 
       assert_routing(
         { :path => "/api/0.6/notes/search", :method => :get },
-        { :controller => "api/notes", :action => "search", :format => "xml" }
+        { :controller => "api/notes", :action => "search" }
       )
       assert_recognizes(
         { :controller => "api/notes", :action => "search", :format => "xml" },
@@ -124,7 +125,7 @@ module Api
     def test_create_success
       assert_difference "Note.count", 1 do
         assert_difference "NoteComment.count", 1 do
-          post :create, :params => { :lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json" }
+          post notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json")
         end
       end
       assert_response :success
@@ -140,7 +141,7 @@ module Api
       assert_nil js["properties"]["comments"].last["user"]
       id = js["properties"]["id"]
 
-      get :show, :params => { :id => id, :format => "json" }
+      get note_path(:id => id, :format => "json")
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -158,63 +159,63 @@ module Api
     def test_create_fail
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lon => -1.0, :text => "This is a comment" }
+          post notes_path(:lon => -1.0, :text => "This is a comment")
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => -1.0, :text => "This is a comment" }
+          post notes_path(:lat => -1.0, :text => "This is a comment")
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => -1.0, :lon => -1.0 }
+          post notes_path(:lat => -1.0, :lon => -1.0)
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => -1.0, :lon => -1.0, :text => "" }
+          post notes_path(:lat => -1.0, :lon => -1.0, :text => "")
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => -100.0, :lon => -1.0, :text => "This is a comment" }
+          post notes_path(:lat => -100.0, :lon => -1.0, :text => "This is a comment")
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => -1.0, :lon => -200.0, :text => "This is a comment" }
+          post notes_path(:lat => -1.0, :lon => -200.0, :text => "This is a comment")
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => "abc", :lon => -1.0, :text => "This is a comment" }
+          post notes_path(:lat => "abc", :lon => -1.0, :text => "This is a comment")
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => -1.0, :lon => "abc", :text => "This is a comment" }
+          post notes_path(:lat => -1.0, :lon => "abc", :text => "This is a comment")
         end
       end
       assert_response :bad_request
 
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
-          post :create, :params => { :lat => -1.0, :lon => -1.0, :text => "x\u0000y" }
+          post notes_path(:lat => -1.0, :lon => -1.0, :text => "x\u0000y")
         end
       end
       assert_response :bad_request
@@ -223,11 +224,11 @@ module Api
     def test_comment_success
       open_note_with_comment = create(:note_with_comments)
       user = create(:user)
-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"
       assert_difference "NoteComment.count", 1 do
         assert_no_difference "ActionMailer::Base.deliveries.size" do
           perform_enqueued_jobs do
-            post :comment, :params => { :id => open_note_with_comment.id, :text => "This is an additional comment", :format => "json" }
+            post comment_note_path(:id => open_note_with_comment, :text => "This is an additional comment", :format => "json"), :headers => auth_header
           end
         end
       end
@@ -242,7 +243,7 @@ module Api
       assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
-      get :show, :params => { :id => open_note_with_comment.id, :format => "json" }
+      get note_path(:id => open_note_with_comment, :format => "json")
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -264,12 +265,12 @@ module Api
         create(:note_comment, :note => note, :author => second_user)
       end
 
-      basic_authorization third_user.email, "test"
+      auth_header = basic_authorization_header third_user.email, "test"
 
       assert_difference "NoteComment.count", 1 do
         assert_difference "ActionMailer::Base.deliveries.size", 2 do
           perform_enqueued_jobs do
-            post :comment, :params => { :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json" }
+            post comment_note_path(:id => note_with_comments_by_users, :text => "This is an additional comment", :format => "json"), :headers => auth_header
           end
         end
       end
@@ -295,7 +296,7 @@ module Api
       assert_equal 1, email.to.length
       assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on a note you are interested in", email.subject
 
-      get :show, :params => { :id => note_with_comments_by_users.id, :format => "json" }
+      get note_path(:id => note_with_comments_by_users, :format => "json")
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -316,48 +317,43 @@ module Api
       user = create(:user)
 
       assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :text => "This is an additional comment" }
+        post comment_note_path(:id => open_note_with_comment)
         assert_response :unauthorized
       end
 
-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"
 
       assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :text => "This is an additional comment" }
+        post comment_note_path(:id => open_note_with_comment), :headers => auth_header
       end
       assert_response :bad_request
 
       assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :id => open_note_with_comment.id }
+        post comment_note_path(:id => open_note_with_comment, :text => ""), :headers => auth_header
       end
       assert_response :bad_request
 
       assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :id => open_note_with_comment.id, :text => "" }
-      end
-      assert_response :bad_request
-
-      assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :id => 12345, :text => "This is an additional comment" }
+        post comment_note_path(:id => 12345, :text => "This is an additional comment"), :headers => auth_header
       end
       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
       assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :id => hidden_note_with_comment.id, :text => "This is an additional comment" }
+        post comment_note_path(:id => hidden_note_with_comment, :text => "This is an additional comment"), :headers => auth_header
       end
       assert_response :gone
 
-      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now)
+      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
 
       assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :id => closed_note_with_comment.id, :text => "This is an additional comment" }
+        post comment_note_path(:id => closed_note_with_comment, :text => "This is an additional comment"), :headers => auth_header
       end
       assert_response :conflict
 
       assert_no_difference "NoteComment.count" do
-        post :comment, :params => { :id => open_note_with_comment.id, :text => "x\u0000y" }
+        post comment_note_path(:id => open_note_with_comment, :text => "x\u0000y"), :headers => auth_header
       end
       assert_response :bad_request
     end
@@ -366,12 +362,12 @@ module Api
       open_note_with_comment = create(:note_with_comments)
       user = create(:user)
 
-      post :close, :params => { :id => open_note_with_comment.id, :text => "This is a close comment", :format => "json" }
+      post close_note_path(:id => open_note_with_comment, :text => "This is a close comment", :format => "json")
       assert_response :unauthorized
 
-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"
 
-      post :close, :params => { :id => open_note_with_comment.id, :text => "This is a close comment", :format => "json" }
+      post close_note_path(:id => open_note_with_comment, :text => "This is a close comment", :format => "json"), :headers => auth_header
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -383,7 +379,7 @@ module Api
       assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
-      get :show, :params => { :id => open_note_with_comment.id, :format => "json" }
+      get note_path(:id => open_note_with_comment.id, :format => "json")
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -397,38 +393,35 @@ module Api
     end
 
     def test_close_fail
-      post :close
+      post close_note_path(:id => 12345)
       assert_response :unauthorized
 
-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"
 
-      post :close
-      assert_response :bad_request
-
-      post :close, :params => { :id => 12345 }
+      post close_note_path(:id => 12345), :headers => auth_header
       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
-      post :close, :params => { :id => hidden_note_with_comment.id }
+      post close_note_path(:id => hidden_note_with_comment), :headers => auth_header
       assert_response :gone
 
-      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now)
+      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
 
-      post :close, :params => { :id => closed_note_with_comment.id }
+      post close_note_path(:id => closed_note_with_comment), :headers => auth_header
       assert_response :conflict
     end
 
     def test_reopen_success
-      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now)
+      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
       user = create(:user)
 
-      post :reopen, :params => { :id => closed_note_with_comment.id, :text => "This is a reopen comment", :format => "json" }
+      post reopen_note_path(:id => closed_note_with_comment, :text => "This is a reopen comment", :format => "json")
       assert_response :unauthorized
 
-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"
 
-      post :reopen, :params => { :id => closed_note_with_comment.id, :text => "This is a reopen comment", :format => "json" }
+      post reopen_note_path(:id => closed_note_with_comment, :text => "This is a reopen comment", :format => "json"), :headers => auth_header
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -440,7 +433,7 @@ module Api
       assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
-      get :show, :params => { :id => closed_note_with_comment.id, :format => "json" }
+      get note_path(:id => closed_note_with_comment, :format => "json")
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -456,29 +449,29 @@ module Api
     def test_reopen_fail
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
-      post :reopen, :params => { :id => hidden_note_with_comment.id }
+      post reopen_note_path(:id => hidden_note_with_comment)
       assert_response :unauthorized
 
-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"
 
-      post :reopen, :params => { :id => 12345 }
+      post reopen_note_path(:id => 12345), :headers => auth_header
       assert_response :not_found
 
-      post :reopen, :params => { :id => hidden_note_with_comment.id }
+      post reopen_note_path(:id => hidden_note_with_comment), :headers => auth_header
       assert_response :gone
 
       open_note_with_comment = create(:note_with_comments)
 
-      post :reopen, :params => { :id => open_note_with_comment.id }
+      post reopen_note_path(:id => open_note_with_comment), :headers => auth_header
       assert_response :conflict
     end
 
     def test_show_success
       open_note = create(:note_with_comments)
 
-      get :show, :params => { :id => open_note.id, :format => "xml" }
+      get note_path(:id => open_note, :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note[lat='#{open_note.lat}'][lon='#{open_note.lon}']", :count => 1 do
           assert_select "id", open_note.id.to_s
@@ -493,25 +486,25 @@ module Api
         end
       end
 
-      get :show, :params => { :id => open_note.id, :format => "rss" }
+      get note_path(:id => open_note, :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 1 do
             assert_select "link", browse_note_url(open_note)
             assert_select "guid", note_url(open_note)
-            assert_select "pubDate", open_note.created_at.to_s(:rfc822)
-            #          assert_select "geo:lat", open_note.lat.to_s
-            #          assert_select "geo:long", open_note.lon
-            #          assert_select "georss:point", "#{open_note.lon} #{open_note.lon}"
+            assert_select "pubDate", open_note.created_at.to_fs(:rfc822)
+            assert_select "geo|lat", open_note.lat.to_s
+            assert_select "geo|long", open_note.lon.to_s
+            assert_select "georss|point", "#{open_note.lon} #{open_note.lon}"
           end
         end
       end
 
-      get :show, :params => { :id => open_note.id, :format => "json" }
+      get note_path(:id => open_note, :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "Feature", js["type"]
@@ -525,15 +518,15 @@ module Api
       assert_equal open_note.created_at.to_s, js["properties"]["date_created"]
       assert_equal open_note.status, js["properties"]["status"]
 
-      get :show, :params => { :id => open_note.id, :format => "gpx" }
+      get note_path(:id => open_note, :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt[lat='#{open_note.lat}'][lon='#{open_note.lon}']", :count => 1 do
           assert_select "time", :count => 1
           assert_select "name", "Note: #{open_note.id}"
           assert_select "desc", :count => 1
-          assert_select "link[href='http://test.host/note/#{open_note.id}']", :count => 1
+          assert_select "link[href='http://www.example.com/note/#{open_note.id}']", :count => 1
           assert_select "extensions", :count => 1 do
             assert_select "id", open_note.id.to_s
             assert_select "url", note_url(open_note, :format => "gpx")
@@ -551,7 +544,7 @@ module Api
         create(:note_comment, :note => note, :body => "Another valid comment for hidden note")
       end
 
-      get :show, :params => { :id => note_with_hidden_comment.id, :format => "json" }
+      get note_path(:id => note_with_hidden_comment, :format => "json")
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -563,10 +556,10 @@ module Api
     end
 
     def test_show_fail
-      get :show, :params => { :id => 12345 }
+      get note_path(:id => 12345)
       assert_response :not_found
 
-      get :show, :params => { :id => create(:note, :status => "hidden").id }
+      get note_path(:id => create(:note, :status => "hidden"))
       assert_response :gone
     end
 
@@ -575,17 +568,17 @@ module Api
       user = create(:user)
       moderator_user = create(:moderator_user)
 
-      delete :destroy, :params => { :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json" }
+      delete note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json")
       assert_response :unauthorized
 
-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"
 
-      delete :destroy, :params => { :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json" }
+      delete note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header
       assert_response :forbidden
 
-      basic_authorization moderator_user.email, "test"
+      auth_header = basic_authorization_header moderator_user.email, "test"
 
-      delete :destroy, :params => { :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json" }
+      delete note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
@@ -597,11 +590,12 @@ module Api
       assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
       assert_equal moderator_user.display_name, js["properties"]["comments"].last["user"]
 
-      get :show, :params => { :id => open_note_with_comment.id, :format => "json" }
+      get note_path(:id => open_note_with_comment, :format => "json"), :headers => auth_header
       assert_response :success
 
-      basic_authorization user.email, "test"
-      get :show, :params => { :id => open_note_with_comment.id, :format => "json" }
+      auth_header = basic_authorization_header user.email, "test"
+
+      get note_path(:id => open_note_with_comment, :format => "json"), :headers => auth_header
       assert_response :gone
     end
 
@@ -609,22 +603,22 @@ module Api
       user = create(:user)
       moderator_user = create(:moderator_user)
 
-      delete :destroy, :params => { :id => 12345, :format => "json" }
+      delete note_path(:id => 12345, :format => "json")
       assert_response :unauthorized
 
-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"
 
-      delete :destroy, :params => { :id => 12345, :format => "json" }
+      delete note_path(:id => 12345, :format => "json"), :headers => auth_header
       assert_response :forbidden
 
-      basic_authorization moderator_user.email, "test"
+      auth_header = basic_authorization_header moderator_user.email, "test"
 
-      delete :destroy, :params => { :id => 12345, :format => "json" }
+      delete note_path(:id => 12345, :format => "json"), :headers => auth_header
       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
-      delete :destroy, :params => { :id => hidden_note_with_comment.id, :format => "json" }
+      delete note_path(:id => hidden_note_with_comment, :format => "json"), :headers => auth_header
       assert_response :gone
     end
 
@@ -633,33 +627,34 @@ module Api
       create(:note_with_comments, :latitude => position, :longitude => position)
       create(:note_with_comments, :latitude => position, :longitude => position)
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :format => "rss" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
+          assert_select "description", :text => /1\.2/, :count => 1
           assert_select "item", :count => 2
         end
       end
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :format => "json" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 2, js["features"].count
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :format => "xml" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 2
       end
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :format => "gpx" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 2
       end
@@ -670,117 +665,117 @@ module Api
       create(:note_with_comments, :latitude => position, :longitude => position)
       create(:note_with_comments, :latitude => position, :longitude => position)
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :limit => 1, :format => "rss" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 1
         end
       end
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :limit => 1, :format => "json" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 1, js["features"].count
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :limit => 1, :format => "xml" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 1
       end
 
-      get :index, :params => { :bbox => "1,1,1.2,1.2", :limit => 1, :format => "gpx" }
+      get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end
     end
 
     def test_index_empty_area
-      get :index, :params => { :bbox => "5,5,5.1,5.1", :format => "rss" }
+      get notes_path(:bbox => "5,5,5.1,5.1", :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 0
         end
       end
 
-      get :index, :params => { :bbox => "5,5,5.1,5.1", :format => "json" }
+      get notes_path(:bbox => "5,5,5.1,5.1", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 0, js["features"].count
 
-      get :index, :params => { :bbox => "5,5,5.1,5.1", :format => "xml" }
+      get notes_path(:bbox => "5,5,5.1,5.1", :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 0
       end
 
-      get :index, :params => { :bbox => "5,5,5.1,5.1", :format => "gpx" }
+      get notes_path(:bbox => "5,5,5.1,5.1", :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 0
       end
     end
 
     def test_index_large_area
-      get :index, :params => { :bbox => "-2.5,-2.5,2.5,2.5", :format => :json }
+      get notes_path(:bbox => "-2.5,-2.5,2.5,2.5", :format => :json)
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
 
-      get :index, :params => { :l => "-2.5", :b => "-2.5", :r => "2.5", :t => "2.5", :format => :json }
+      get notes_path(:l => "-2.5", :b => "-2.5", :r => "2.5", :t => "2.5", :format => :json)
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
 
-      get :index, :params => { :bbox => "-10,-10,12,12", :format => :json }
+      get notes_path(:bbox => "-10,-10,12,12", :format => :json)
       assert_response :bad_request
-      assert_equal "application/json", @response.content_type
+      assert_equal "text/plain", @response.media_type
 
-      get :index, :params => { :l => "-10", :b => "-10", :r => "12", :t => "12", :format => :json }
+      get notes_path(:l => "-10", :b => "-10", :r => "12", :t => "12", :format => :json)
       assert_response :bad_request
-      assert_equal "application/json", @response.content_type
+      assert_equal "text/plain", @response.media_type
     end
 
     def test_index_closed
-      create(:note_with_comments, :status => "closed", :closed_at => Time.now - 5.days)
-      create(:note_with_comments, :status => "closed", :closed_at => Time.now - 100.days)
+      create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 5.days)
+      create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 100.days)
       create(:note_with_comments, :status => "hidden")
       create(:note_with_comments)
 
       # Open notes + closed in last 7 days
-      get :index, :params => { :bbox => "1,1,1.7,1.7", :closed => "7", :format => "json" }
+      get notes_path(:bbox => "1,1,1.7,1.7", :closed => "7", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 2, js["features"].count
 
       # Only open notes
-      get :index, :params => { :bbox => "1,1,1.7,1.7", :closed => "0", :format => "json" }
+      get notes_path(:bbox => "1,1,1.7,1.7", :closed => "0", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 1, js["features"].count
 
       # Open notes + all closed notes
-      get :index, :params => { :bbox => "1,1,1.7,1.7", :closed => "-1", :format => "json" }
+      get notes_path(:bbox => "1,1,1.7,1.7", :closed => "-1", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
@@ -788,61 +783,61 @@ module Api
     end
 
     def test_index_bad_params
-      get :index, :params => { :bbox => "-2.5,-2.5,2.5" }
+      get notes_path(:bbox => "-2.5,-2.5,2.5")
       assert_response :bad_request
 
-      get :index, :params => { :bbox => "-2.5,-2.5,2.5,2.5,2.5" }
+      get notes_path(:bbox => "-2.5,-2.5,2.5,2.5,2.5")
       assert_response :bad_request
 
-      get :index, :params => { :b => "-2.5", :r => "2.5", :t => "2.5" }
+      get notes_path(:b => "-2.5", :r => "2.5", :t => "2.5")
       assert_response :bad_request
 
-      get :index, :params => { :l => "-2.5", :r => "2.5", :t => "2.5" }
+      get notes_path(:l => "-2.5", :r => "2.5", :t => "2.5")
       assert_response :bad_request
 
-      get :index, :params => { :l => "-2.5", :b => "-2.5", :t => "2.5" }
+      get notes_path(:l => "-2.5", :b => "-2.5", :t => "2.5")
       assert_response :bad_request
 
-      get :index, :params => { :l => "-2.5", :b => "-2.5", :r => "2.5" }
+      get notes_path(:l => "-2.5", :b => "-2.5", :r => "2.5")
       assert_response :bad_request
 
-      get :index, :params => { :bbox => "1,1,1.7,1.7", :limit => "0", :format => "json" }
+      get notes_path(:bbox => "1,1,1.7,1.7", :limit => "0", :format => "json")
       assert_response :bad_request
 
-      get :index, :params => { :bbox => "1,1,1.7,1.7", :limit => "10001", :format => "json" }
+      get notes_path(:bbox => "1,1,1.7,1.7", :limit => "10001", :format => "json")
       assert_response :bad_request
     end
 
     def test_search_success
       create(:note_with_comments)
 
-      get :search, :params => { :q => "note comment", :format => "xml" }
+      get search_notes_path(:q => "note comment", :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 1
       end
 
-      get :search, :params => { :q => "note comment", :format => "json" }
+      get search_notes_path(:q => "note comment", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 1, js["features"].count
 
-      get :search, :params => { :q => "note comment", :format => "rss" }
+      get search_notes_path(:q => "note comment", :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 1
         end
       end
 
-      get :search, :params => { :q => "note comment", :format => "gpx" }
+      get search_notes_path(:q => "note comment", :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end
@@ -855,33 +850,33 @@ module Api
         create(:note_comment, :note => note, :author => user)
       end
 
-      get :search, :params => { :display_name => user.display_name, :format => "xml" }
+      get search_notes_path(:display_name => user.display_name, :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 1
       end
 
-      get :search, :params => { :display_name => user.display_name, :format => "json" }
+      get search_notes_path(:display_name => user.display_name, :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 1, js["features"].count
 
-      get :search, :params => { :display_name => user.display_name, :format => "rss" }
+      get search_notes_path(:display_name => user.display_name, :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 1
         end
       end
 
-      get :search, :params => { :display_name => user.display_name, :format => "gpx" }
+      get search_notes_path(:display_name => user.display_name, :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end
@@ -894,33 +889,33 @@ module Api
         create(:note_comment, :note => note, :author => user)
       end
 
-      get :search, :params => { :user => user.id, :format => "xml" }
+      get search_notes_path(:user => user.id, :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 1
       end
 
-      get :search, :params => { :user => user.id, :format => "json" }
+      get search_notes_path(:user => user.id, :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 1, js["features"].count
 
-      get :search, :params => { :user => user.id, :format => "rss" }
+      get search_notes_path(:user => user.id, :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 1
         end
       end
 
-      get :search, :params => { :user => user.id, :format => "gpx" }
+      get search_notes_path(:user => user.id, :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end
@@ -929,33 +924,33 @@ module Api
     def test_search_no_match
       create(:note_with_comments)
 
-      get :search, :params => { :q => "no match", :format => "xml" }
+      get search_notes_path(:q => "no match", :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 0
       end
 
-      get :search, :params => { :q => "no match", :format => "json" }
+      get search_notes_path(:q => "no match", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 0, js["features"].count
 
-      get :search, :params => { :q => "no match", :format => "rss" }
+      get search_notes_path(:q => "no match", :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 0
         end
       end
 
-      get :search, :params => { :q => "no match", :format => "gpx" }
+      get search_notes_path(:q => "no match", :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 0
       end
@@ -964,55 +959,55 @@ module Api
     def test_search_by_time_no_match
       create(:note_with_comments)
 
-      get :search, :params => { :from => "01.01.2010", :to => "01.10.2010", :format => "xml" }
+      get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "xml")
       assert_response :success
-      assert_equal "application/xml", @response.content_type
+      assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
         assert_select "note", :count => 0
       end
 
-      get :search, :params => { :from => "01.01.2010", :to => "01.10.2010", :format => "json" }
+      get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "json")
       assert_response :success
-      assert_equal "application/json", @response.content_type
+      assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "FeatureCollection", js["type"]
       assert_equal 0, js["features"].count
 
-      get :search, :params => { :from => "01.01.2010", :to => "01.10.2010", :format => "rss" }
+      get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 0
         end
       end
 
-      get :search, :params => { :from => "01.01.2010", :to => "01.10.2010", :format => "gpx" }
+      get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "gpx")
       assert_response :success
-      assert_equal "application/gpx+xml", @response.content_type
+      assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 0
       end
     end
 
     def test_search_bad_params
-      get :search, :params => { :q => "no match", :limit => "0", :format => "json" }
+      get search_notes_path(:q => "no match", :limit => "0", :format => "json")
       assert_response :bad_request
 
-      get :search, :params => { :q => "no match", :limit => "10001", :format => "json" }
+      get search_notes_path(:q => "no match", :limit => "10001", :format => "json")
       assert_response :bad_request
 
-      get :search, :params => { :display_name => "non-existent" }
+      get search_notes_path(:display_name => "non-existent")
       assert_response :bad_request
 
-      get :search, :params => { :user => "-1" }
+      get search_notes_path(:user => "-1")
       assert_response :bad_request
 
-      get :search, :params => { :from => "wrong-date", :to => "wrong-date" }
+      get search_notes_path(:from => "wrong-date", :to => "wrong-date")
       assert_response :bad_request
 
-      get :search, :params => { :from => "01.01.2010", :to => "2010.01.2010" }
+      get search_notes_path(:from => "01.01.2010", :to => "2010.01.2010")
       assert_response :bad_request
     end
 
@@ -1024,36 +1019,37 @@ module Api
       create(:note_with_comments, :latitude => position, :longitude => position)
       create(:note_with_comments, :latitude => position, :longitude => position)
 
-      get :feed, :params => { :format => "rss" }
+      get feed_notes_path(:format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
           assert_select "item", :count => 4
         end
       end
 
-      get :feed, :params => { :bbox => "1,1,1.2,1.2", :format => "rss" }
+      get feed_notes_path(:bbox => "1,1,1.2,1.2", :format => "rss")
       assert_response :success
-      assert_equal "application/rss+xml", @response.content_type
+      assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
         assert_select "channel", :count => 1 do
+          assert_select "description", :text => /1\.2/, :count => 1
           assert_select "item", :count => 2
         end
       end
     end
 
     def test_feed_fail
-      get :feed, :params => { :bbox => "1,1,1.2", :format => "rss" }
+      get feed_notes_path(:bbox => "1,1,1.2", :format => "rss")
       assert_response :bad_request
 
-      get :feed, :params => { :bbox => "1,1,1.2,1.2,1.2", :format => "rss" }
+      get feed_notes_path(:bbox => "1,1,1.2,1.2,1.2", :format => "rss")
       assert_response :bad_request
 
-      get :feed, :params => { :bbox => "1,1,1.2,1.2", :limit => "0", :format => "rss" }
+      get feed_notes_path(:bbox => "1,1,1.2,1.2", :limit => "0", :format => "rss")
       assert_response :bad_request
 
-      get :feed, :params => { :bbox => "1,1,1.2,1.2", :limit => "10001", :format => "rss" }
+      get feed_notes_path(:bbox => "1,1,1.2,1.2", :limit => "10001", :format => "rss")
       assert_response :bad_request
     end
   end