Use max note query limit setting in tests

[rails.git] / 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 da24781698bc1bfc7c9a55563b930db8a317d6db..81e6b0ba14688670c3c707b4c8f8de54f15d8687 100644 (file)
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -695,6 +695,9 @@ module Api
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end

+
+      get api_notes_path(:bbox => "1,1,1.2,1.2", :limit => Settings.max_note_query_limit, :format => "rss")
+      assert_response :success

     end
 
     def test_index_empty_area
     end
 
     def test_index_empty_area


@@ -804,7 +807,7 @@ module Api
       get api_notes_path(:bbox => "1,1,1.7,1.7", :limit => "0", :format => "json")
       assert_response :bad_request
 
       get api_notes_path(:bbox => "1,1,1.7,1.7", :limit => "0", :format => "json")
       assert_response :bad_request
 

-      get api_notes_path(:bbox => "1,1,1.7,1.7", :limit => "10001", :format => "json")
+      get api_notes_path(:bbox => "1,1,1.7,1.7", :limit => Settings.max_note_query_limit + 1, :format => "json")

       assert_response :bad_request
     end
 
       assert_response :bad_request
     end
 


@@ -841,6 +844,9 @@ module Api
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end
       assert_select "gpx", :count => 1 do
         assert_select "wpt", :count => 1
       end

+
+      get search_api_notes_path(:q => "note comment", :limit => Settings.max_note_query_limit, :format => "xml")
+      assert_response :success

     end
 
     def test_search_by_display_name_success
     end
 
     def test_search_by_display_name_success


@@ -995,7 +1001,7 @@ module Api
       get search_api_notes_path(:q => "no match", :limit => "0", :format => "json")
       assert_response :bad_request
 
       get search_api_notes_path(:q => "no match", :limit => "0", :format => "json")
       assert_response :bad_request
 

-      get search_api_notes_path(:q => "no match", :limit => "10001", :format => "json")
+      get search_api_notes_path(:q => "no match", :limit => Settings.max_note_query_limit + 1, :format => "json")

       assert_response :bad_request
 
       get search_api_notes_path(:display_name => "non-existent")
       assert_response :bad_request
 
       get search_api_notes_path(:display_name => "non-existent")


@@ -1037,6 +1043,9 @@ module Api
           assert_select "item", :count => 2
         end
       end
           assert_select "item", :count => 2
         end
       end

+
+      get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => Settings.max_note_query_limit, :format => "rss")
+      assert_response :success

     end
 
     def test_feed_fail
     end
 
     def test_feed_fail


@@ -1049,7 +1058,7 @@ module Api
       get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => "0", :format => "rss")
       assert_response :bad_request
 
       get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => "0", :format => "rss")
       assert_response :bad_request
 

-      get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => "10001", :format => "rss")
+      get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => Settings.max_note_query_limit + 1, :format => "rss")

       assert_response :bad_request
     end
   end
       assert_response :bad_request
     end
   end