From: Kai Krueger <kakrueger@gmail.com>
Date: Sun, 21 Mar 2010 12:04:15 +0000 (+0000)
Subject: minor improvement to the map_bugs tests
X-Git-Tag: live~5625^2~219
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4aec8dc3a55654a847c91ef07c3c99428e3a6f11

minor improvement to the map_bugs tests
---

diff --git a/test/fixtures/map_bug_comment.yml b/test/fixtures/map_bug_comment.yml
index b322c131e..5ff9c36de 100644
--- a/test/fixtures/map_bug_comment.yml
+++ b/test/fixtures/map_bug_comment.yml
@@ -54,9 +54,9 @@ t6:
   date_created: 2007-01-01 00:00:00
   commenter_name: 'testname'
   commenter_ip: '192.168.1.1'
-  comment: 'Valid Comment for bug 5'
+  comment: 'Valid comment for bug 5'
 
-t6:
+t7:
   id: 7
   bug_id: 5
   visible: false
diff --git a/test/functional/map_bugs_controller_test.rb b/test/functional/map_bugs_controller_test.rb
index b719e857e..b701e244e 100644
--- a/test/functional/map_bugs_controller_test.rb
+++ b/test/functional/map_bugs_controller_test.rb
@@ -9,49 +9,74 @@ class MapBugsControllerTest < ActionController::TestCase
         post :add_bug, {:lat => -1.0, :lon => -1.0, :name => "new_tester", :text => "This is a comment"}
 	  end
 	end
-    assert_response :success      
+    assert_response :success
+	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
   end
 
   def test_map_bug_comment_create_success
     assert_difference('MapBugComment.count') do
-        post :edit_bug, {:id => 2, :name => "new_tester", :text => "This is an additional comment"}
+        post :edit_bug, {:id => 2, :name => "new_tester2", :text => "This is an additional comment"}
     end
-    assert_response :success      
+    assert_response :success
+
+	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
+
   end
 
   def test_map_bug_read_success
     get :read, {:id => 1}
     assert_response :success      
-  end
 
-  def test_map_bug_read_xml_success
     get :read, {:id => 1,  :format => 'xml'}
-    assert_response :success      
-  end
+    assert_response :success
 
-  def test_map_bug_read_rss_success
     get :read, {:id => 1,  :format => 'rss'}
-    assert_response :success      
-  end
+    assert_response :success
 
-  def test_map_bug_read_json_success
     get :read, {:id => 1,  :format => 'json'}
-    assert_response :success      
-  end
+    assert_response :success
 
-  def test_map_bug_read_gpx_success
     get :read, {:id => 1,  :format => 'gpx'}
     assert_response :success
   end
 
   def test_map_bug_close_success
 	post :close_bug, {:id => 2}
-    assert_response :success      
+    assert_response :success
+
+	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 :get_bugs, {: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 :get_bugs, {: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
   end
 
   def test_get_bugs_large_area_success
@@ -74,33 +99,31 @@ class MapBugsControllerTest < ActionController::TestCase
 	assert_response :success
   end
 
-  def test_get_bugs_rss_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'rss'}
-	assert_response :success
-  end
 
-  def test_get_bugs_json_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'json'}
+  def test_search_success
+	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1'}
 	assert_response :success
-  end
 
-  def test_get_bugs_xml_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'xml'}
+	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'xml'}
 	assert_response :success
-  end
 
-  def test_get_bugs_gpx_success
-	get :get_bugs, {:bbox=>'1,1,1.2,1.2', :format => 'gpx'}
+	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'json'}
 	assert_response :success
-  end
-
 
+	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1', :format => 'rss'}
+	assert_response :success
 
-  def test_search_success
-	get :search, {:bbox=>'1,1,1.2,1.2', :q => 'bug 1'}
+	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
+	assert_response :success
+  end
 
   def test_map_bug_comment_create_not_found
     assert_no_difference('MapBugComment.count') do
@@ -124,5 +147,16 @@ class MapBugsControllerTest < ActionController::TestCase
     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
+  end
+  
+
   
 end