X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52611a5bfa69165179bd871b925b5f8b14942e2e..9fc99d28ba0ef1e5235d62e7465f8eaa81de3402:/test/functional/notes_controller_test.rb

diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index 4bd0aa6cf..ab56ba2d8 100644
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -388,39 +388,87 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_get_notes_success
-#    get :index, {:bbox => '1,1,1.2,1.2'}
-#    assert_response :success
-#    assert_equal "text/javascript", @response.content_type
-
     get :index, {:bbox => '1,1,1.2,1.2', :format => 'rss'}
     assert_response :success
     assert_equal "application/rss+xml", @response.content_type
+    assert_select "rss", :count => 1 do
+      assert_select "channel", :count => 1 do
+        assert_select "item", :count => 2
+      end
+    end
 
     get :index, {:bbox => '1,1,1.2,1.2', :format => 'json'}
     assert_response :success
     assert_equal "application/json", @response.content_type
+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "FeatureCollection", js["type"]
+    assert_equal 2, js["features"].count
 
     get :index, {:bbox => '1,1,1.2,1.2', :format => 'xml'}
     assert_response :success
     assert_equal "application/xml", @response.content_type
+    assert_select "osm", :count => 1 do
+      assert_select "note", :count => 2
+    end
 
     get :index, {:bbox => '1,1,1.2,1.2', :format => 'gpx'}
     assert_response :success
     assert_equal "application/gpx+xml", @response.content_type
+    assert_select "gpx", :count => 1 do
+      assert_select "wpt", :count => 2
+    end
+  end
+
+  def test_get_notes_empty_area
+    get :index, {:bbox => '5,5,5.1,5.1', :format => 'rss'}
+    assert_response :success
+    assert_equal "application/rss+xml", @response.content_type
+    assert_select "rss", :count => 1 do
+      assert_select "channel", :count => 1 do
+        assert_select "item", :count => 0
+      end
+    end
+
+    get :index, {:bbox => '5,5,5.1,5.1', :format => 'json'}
+    assert_response :success
+    assert_equal "application/json", @response.content_type
+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "FeatureCollection", js["type"]
+    assert_equal 0, js["features"].count
+
+    get :index, {:bbox => '5,5,5.1,5.1', :format => 'xml'}
+    assert_response :success
+    assert_equal "application/xml", @response.content_type
+    assert_select "osm", :count => 1 do
+      assert_select "note", :count => 0
+    end
+
+    get :index, {:bbox => '5,5,5.1,5.1', :format => 'gpx'}
+    assert_response :success
+    assert_equal "application/gpx+xml", @response.content_type
+    assert_select "gpx", :count => 1 do
+      assert_select "wpt", :count => 0
+    end
   end
 
   def test_get_notes_large_area
-#    get :index, {:bbox => '-2.5,-2.5,2.5,2.5'}
-#    assert_response :success
+    get :index, {:bbox => '-2.5,-2.5,2.5,2.5', :format => :json}
+    assert_response :success
+    assert_equal "application/json", @response.content_type
 
-#    get :index, {:l => '-2.5', :b => '-2.5', :r => '2.5', :t => '2.5'}
-#    assert_response :success
+    get :index, {:l => '-2.5', :b => '-2.5', :r => '2.5', :t => '2.5', :format => :json}
+    assert_response :success
+    assert_equal "application/json", @response.content_type
 
-    get :index, {:bbox => '-10,-10,12,12'}
+    get :index, {:bbox => '-10,-10,12,12', :format => :json}
     assert_response :bad_request
+    assert_equal "text/plain", @response.content_type
 
-    get :index, {:l => '-10', :b => '-10', :r => '12', :t => '12'}
+    get :index, {:l => '-10', :b => '-10', :r => '12', :t => '12', :format => :json}
     assert_response :bad_request
+    assert_equal "text/plain", @response.content_type
   end
 
   def test_get_notes_closed
@@ -473,18 +521,66 @@ class NotesControllerTest < ActionController::TestCase
     get :search, {:q => 'note 1', :format => 'xml'}
     assert_response :success
     assert_equal "application/xml", @response.content_type
+    assert_select "osm", :count => 1 do
+      assert_select "note", :count => 1
+    end
 
     get :search, {:q => 'note 1', :format => 'json'}
     assert_response :success
     assert_equal "application/json", @response.content_type
+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "FeatureCollection", js["type"]
+    assert_equal 1, js["features"].count
 
     get :search, {:q => 'note 1', :format => 'rss'}
     assert_response :success
     assert_equal "application/rss+xml", @response.content_type
+    assert_select "rss", :count => 1 do
+      assert_select "channel", :count => 1 do
+        assert_select "item", :count => 1
+      end
+    end
 
     get :search, {:q => 'note 1', :format => 'gpx'}
     assert_response :success
     assert_equal "application/gpx+xml", @response.content_type
+    assert_select "gpx", :count => 1 do
+      assert_select "wpt", :count => 1
+    end
+  end
+
+  def test_search_no_match
+    get :search, {:q => 'no match', :format => 'xml'}
+    assert_response :success
+    assert_equal "application/xml", @response.content_type
+    assert_select "osm", :count => 1 do
+      assert_select "note", :count => 0
+    end
+
+    get :search, {:q => 'no match', :format => 'json'}
+    assert_response :success
+    assert_equal "application/json", @response.content_type
+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "FeatureCollection", js["type"]
+    assert_equal 0, js["features"].count
+
+    get :search, {:q => 'no match', :format => 'rss'}
+    assert_response :success
+    assert_equal "application/rss+xml", @response.content_type
+    assert_select "rss", :count => 1 do
+      assert_select "channel", :count => 1 do
+        assert_select "item", :count => 0
+      end
+    end
+
+    get :search, {:q => 'no match', :format => 'gpx'}
+    assert_response :success
+    assert_equal "application/gpx+xml", @response.content_type
+    assert_select "gpx", :count => 1 do
+      assert_select "wpt", :count => 0
+    end
   end
 
   def test_search_bad_params