X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9c9d6c1aafdd60c72b54345b4d2dc94317298a0..f4928d0e952ddbde662517d781367dd97eab86a7:/test/functional/map_bugs_controller_test.rb

diff --git a/test/functional/map_bugs_controller_test.rb b/test/functional/map_bugs_controller_test.rb
index c3335d2b1..b88f2608a 100644
--- a/test/functional/map_bugs_controller_test.rb
+++ b/test/functional/map_bugs_controller_test.rb
@@ -5,34 +5,33 @@ class MapBugsControllerTest < ActionController::TestCase
     
   def test_map_bug_create_success
     assert_difference('MapBug.count') do
-	  assert_difference('MapBugComment.count') do
-        post :add_bug, {:lat => -1.0, :lon => -1.0, :name => "new_tester", :text => "This is a comment"}
-	  end
-	end
+      assert_difference('MapBugComment.count') do
+        post :create, {:lat => -1.0, :lon => -1.0, :name => "new_tester", :text => "This is a comment"}
+      end
+    end
     assert_response :success
-	id = @response.body.sub(/ok/,"").to_i
-	get :read, {:id => id, :format => 'json'}
+    id = @response.body.sub(/ok/,"").to_i
+    get :read, {:id => id, :format => 'json'}
     assert_response :success
-	js = @response.body
-	assert_match "\"status\":\"open\"", js
-	assert_match "\"comment\":\"This is a comment\"", js
-	assert_match "\"commenter_name\":\"new_tester (a)\"", js
+    js = @response.body
+    assert_match "\"status\":\"open\"", js
+    assert_match "\"body\":\"This is a comment\"", js
+    assert_match "\"author_name\":\"new_tester (a)\"", js
   end
 
   def test_map_bug_comment_create_success
     assert_difference('MapBugComment.count') do
-        post :edit_bug, {:id => 2, :name => "new_tester2", :text => "This is an additional comment"}
+      post :update, {:id => 2, :name => "new_tester2", :text => "This is an additional comment"}
     end
     assert_response :success
 
-	get :read, {:id => 2, :format => 'json'}
+    get :read, {:id => 2, :format => 'json'}
     assert_response :success
-	js = @response.body
-	assert_match "\"id\":2", js
-	assert_match "\"status\":\"open\"", js
-	assert_match "\"comment\":\"This is an additional comment\"", js
-	assert_match "\"commenter_name\":\"new_tester2 (a)\"", js
-
+    js = @response.body
+    assert_match "\"id\":2", js
+    assert_match "\"status\":\"open\"", js
+    assert_match "\"body\":\"This is an additional comment\"", js
+    assert_match "\"author_name\":\"new_tester2 (a)\"", js
   end
 
   def test_map_bug_read_success
@@ -53,122 +52,123 @@ class MapBugsControllerTest < ActionController::TestCase
   end
 
   def test_map_bug_close_success
-	post :close_bug, {:id => 2}
+    post :close, {:id => 2}
     assert_response :success
 
-	get :read, {:id => 2, :format => 'json'}
-	js = @response.body
-	assert_match "\"id\":2", js
-	assert_match "\"status\":\"closed\"", js
+    get :read, {:id => 2, :format => 'json'}
+    js = @response.body
+    assert_match "\"id\":2", js
+    assert_match "\"status\":\"closed\"", js
   end
 
   def test_get_bugs_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2'}
+    assert_response :success
 
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'rss'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2', :format => 'rss'}
+    assert_response :success
 
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'json'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2', :format => 'json'}
+    assert_response :success
 
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'xml'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2', :format => 'xml'}
+    assert_response :success
 
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'gpx'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2', :format => 'gpx'}
+    assert_response :success
   end
 
   def test_get_bugs_large_area_success
-	get :get_bugs, {:bbox=>'-10,-10,12,12'}
-	assert_response :success
+    get :list, {:bbox=>'-2.5,-2.5,2.5,2.5'}
+    assert_response :success
+  end
+
+  def test_get_bugs_large_area_bad_request
+    get :list, {:bbox=>'-10,-10,12,12'}
+    assert_response :bad_request
   end
 
   def test_get_bugs_closed_7_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :closed => '7'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2', :closed => '7'}
+    assert_response :success
   end
 
   def test_get_bugs_closed_0_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :closed => '0'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2', :closed => '0'}
+    assert_response :success
   end
 
   def test_get_bugs_closed_n1_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :closed => '-1'}
-	assert_response :success
+    get :list, {:bbox=>'1,1,1.2,1.2', :closed => '-1'}
+    assert_response :success
   end
 
 
   def test_search_success
-	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1'}
-	assert_response :success
+    get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1'}
+    assert_response :success
 
-	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'xml'}
-	assert_response :success
+    get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'xml'}
+    assert_response :success
 
-	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'json'}
-	assert_response :success
+    get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'json'}
+    assert_response :success
 
-	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'rss'}
-	assert_response :success
+    get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'rss'}
+    assert_response :success
 
-	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'gpx'}
-	assert_response :success
+    get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'gpx'}
+    assert_response :success
   end
 
   def test_rss_success
-	get :rss, {:bbox=>'1,1,1.2,1.2'}
-	assert_response :success
+    get :rss, {:bbox=>'1,1,1.2,1.2'}
+    assert_response :success
 	
-	get :rss
-	assert_response :success
+    get :rss
+    assert_response :success
   end
 
   def test_user_bugs_success
-	get :my_bugs, {:display_name=>'test'}
-	assert_response :success
+    get :mine, {:display_name=>'test'}
+    assert_response :success
 
-	get :my_bugs, {:display_name=>'pulibc_test2'}
-	assert_response :success
+    get :mine, {:display_name=>'pulibc_test2'}
+    assert_response :success
 
-	get :my_bugs, {:display_name=>'non-existent'}
-	assert_response :not_found
-	
+    get :mine, {:display_name=>'non-existent'}
+    assert_response :not_found	
   end
 
   def test_map_bug_comment_create_not_found
     assert_no_difference('MapBugComment.count') do
-        post :edit_bug, {:id => 12345, :name => "new_tester", :text => "This is an additional comment"}
+      post :update, {:id => 12345, :name => "new_tester", :text => "This is an additional comment"}
     end
     assert_response :not_found
   end
 
   def test_map_bug_close_not_found
-	post :close_bug, {:id => 12345}
+    post :close, {:id => 12345}
     assert_response :not_found
   end
 
   def test_map_bug_read_not_found
-	get :read, {:id => 12345}
+    get :read, {:id => 12345}
     assert_response :not_found
   end
 
   def test_map_bug_read_gone
-	get :read, {:id => 4}
+    get :read, {:id => 4}
     assert_response :gone
   end
 
   def test_map_bug_hidden_comment
-	get :read, {:id => 5, :format => 'json'}
-	assert_response :success
-	js = @response.body
-	assert_match "\"id\":5", js
-	assert_match "\"comment\":\"Valid comment for bug 5\"", js
-	assert_match "\"comment\":\"Another valid comment for bug 5\"", js
-	assert_no_match /\"comment\":\"Spam for bug 5\"/, js
+    get :read, {:id => 5, :format => 'json'}
+    assert_response :success
+    js = @response.body
+    assert_match "\"id\":5", js
+    assert_match "\"body\":\"Valid comment for bug 5\"", js
+    assert_match "\"body\":\"Another valid comment for bug 5\"", js
+    assert_no_match /\"body\":\"Spam for bug 5\"/, js
   end
-  
-
-  
 end