X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9d2fed811fd37577bf5cce8e8fe03d2097852428..1e2b99a75b4b87855fbb3397fc87c462306dea5d:/test/functional/notes_controller_test.rb

diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index a4720eb06..3e817b6f9 100644
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -628,77 +628,97 @@ class NotesControllerTest < ActionController::TestCase
 
     get :index, {:l => '-2.5', :b => '-2.5', :r => '2.5'}
     assert_response :bad_request
+
+    get :index, {:bbox => '1,1,1.7,1.7', :limit => '0', :format => 'json'}
+    assert_response :bad_request
+
+    get :index, {:bbox => '1,1,1.7,1.7', :limit => '10000', :format => 'json'}
+    assert_response :bad_request
   end
 
   def test_search_success
     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
+    assert_response :service_unavailable
+    # 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
+    assert_response :service_unavailable
+    # 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
+    assert_response :service_unavailable
+    # 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
+    assert_response :service_unavailable
+    # 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
+    assert_response :service_unavailable
+    # 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
+    assert_response :service_unavailable
+    # 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
+    assert_response :service_unavailable
+    # 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
+    assert_response :service_unavailable
+    # 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
     get :search
     assert_response :bad_request
+
+    get :search, {:q => 'no match', :limit => '0', :format => 'json'}
+    assert_response :bad_request
+
+    get :search, {:q => 'no match', :limit => '10000', :format => 'json'}
+    assert_response :bad_request
   end
 
   def test_feed_success
@@ -722,10 +742,16 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_feed_fail
-    get :feed, {:bbox => "1,1,1.2"}
+    get :feed, {:bbox => "1,1,1.2", :format => "rss"}
+    assert_response :bad_request
+
+    get :feed, {:bbox => "1,1,1.2,1.2,1.2", :format => "rss"}
+    assert_response :bad_request
+
+    get :feed, {:bbox => "1,1,1.2,1.2", :limit => '0', :format => "rss"}
     assert_response :bad_request
 
-    get :feed, {:bbox => "1,1,1.2,1.2,1.2"}
+    get :feed, {:bbox => "1,1,1.2,1.2", :limit => '10000', :format => "rss"}
     assert_response :bad_request
   end