Convert tabs to spaces

[rails.git] / test / functional / notes_controller_test.rb

diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index 3e817b6f990f1a8bdd5b6650d71435a6049bc494..374c879d696af6fba53d9830fb52a3cdacc7292d 100644 (file)
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -632,82 +632,74 @@ class NotesControllerTest < ActionController::TestCase
     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 => '0', :format => 'json'}
     assert_response :bad_request
 

-    get :index, {:bbox => '1,1,1.7,1.7', :limit => '10000', :format => 'json'}
+    get :index, {:bbox => '1,1,1.7,1.7', :limit => '10001', :format => 'json'}

     assert_response :bad_request
   end
 
   def test_search_success
     get :search, {:q => 'note 1', :format => 'xml'}
     assert_response :bad_request
   end
 
   def test_search_success
     get :search, {:q => 'note 1', :format => 'xml'}

-    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
+    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'}
 
     get :search, {:q => 'note 1', :format => 'json'}

-    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
+    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'}
 
     get :search, {:q => 'note 1', :format => 'rss'}

-    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
+    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'}
 
     get :search, {:q => 'note 1', :format => 'gpx'}

-    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
+    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'}
   end
 
   def test_search_no_match
     get :search, {:q => 'no match', :format => 'xml'}

-    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
+    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'}
 
     get :search, {:q => 'no match', :format => 'json'}

-    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
+    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'}
 
     get :search, {:q => 'no match', :format => 'rss'}

-    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
+    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'}
 
     get :search, {:q => 'no match', :format => 'gpx'}

-    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
+    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
   end
 
   def test_search_bad_params


@@ -717,7 +709,7 @@ class NotesControllerTest < ActionController::TestCase
     get :search, {:q => 'no match', :limit => '0', :format => 'json'}
     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'}
+    get :search, {:q => 'no match', :limit => '10001', :format => 'json'}

     assert_response :bad_request
   end
 
     assert_response :bad_request
   end
 


@@ -751,7 +743,7 @@ class NotesControllerTest < ActionController::TestCase
     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", :limit => '0', :format => "rss"}
     assert_response :bad_request
 

-    get :feed, {:bbox => "1,1,1.2,1.2", :limit => '10000', :format => "rss"}
+    get :feed, {:bbox => "1,1,1.2,1.2", :limit => '10001', :format => "rss"}

     assert_response :bad_request
   end
 
     assert_response :bad_request
   end