Throw an exception if adding a note comment fails

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

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 2203dcb605adc231ce2d8cdccde2e234ae5ff1f5..3ee283f4a7e7a656b7710963594dac05c46aca03 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -1,7 +1,11 @@
 require "test_helper"
 
 class NotesControllerTest < ActionController::TestCase
-  fixtures :users, :user_roles
+  def setup
+    # Stub nominatim response for note locations
+    stub_request(:get, %r{^http://nominatim\.openstreetmap\.org/reverse\?})
+      .to_return(:status => 404)
+  end
 
   ##
   # test all routes which lead to this controller
@@ -211,6 +215,13 @@ class NotesControllerTest < ActionController::TestCase
       end
     end
     assert_response :bad_request
+
+    assert_no_difference "Note.count" do
+      assert_no_difference "NoteComment.count" do
+        post :create, :lat => -1.0, :lon => -1.0, :text => "x\u0000y"
+      end
+    end
+    assert_response :bad_request
   end
 
   def test_comment_success
@@ -244,9 +255,13 @@ class NotesControllerTest < ActionController::TestCase
     assert_nil js["properties"]["comments"].last["user"]
 
     # Ensure that emails are sent to users
+    first_user = create(:user)
+    second_user = create(:user)
+    third_user = create(:user)
+
     note_with_comments_by_users = create(:note) do |note|
-      create(:note_comment, :note => note, :author => users(:normal_user))
-      create(:note_comment, :note => note, :author => users(:second_public_user))
+      create(:note_comment, :note => note, :author => first_user)
+      create(:note_comment, :note => note, :author => second_user)
     end
     assert_difference "NoteComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 2 do
@@ -264,12 +279,12 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
     assert_nil js["properties"]["comments"].last["user"]
 
-    email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@openstreetmap.org" }
+    email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email }
     assert_not_nil email
     assert_equal 1, email.to.length
     assert_equal "[OpenStreetMap] An anonymous user has commented on one of your notes", email.subject
 
-    email = ActionMailer::Base.deliveries.find { |e| e.to.first == "public@OpenStreetMap.org" }
+    email = ActionMailer::Base.deliveries.find { |e| e.to.first == second_user.email }
     assert_not_nil email
     assert_equal 1, email.to.length
     assert_equal "[OpenStreetMap] An anonymous user has commented on a note you are interested in", email.subject
@@ -288,7 +303,7 @@ class NotesControllerTest < ActionController::TestCase
 
     ActionMailer::Base.deliveries.clear
 
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(third_user.email, "test")
 
     assert_difference "NoteComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 2 do
@@ -304,18 +319,18 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 4, js["properties"]["comments"].count
     assert_equal "commented", js["properties"]["comments"].last["action"]
     assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
-    assert_equal "test2", js["properties"]["comments"].last["user"]
+    assert_equal third_user.display_name, js["properties"]["comments"].last["user"]
 
-    email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@openstreetmap.org" }
+    email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email }
     assert_not_nil email
     assert_equal 1, email.to.length
-    assert_equal "[OpenStreetMap] test2 has commented on one of your notes", email.subject
-    assert_equal "test@openstreetmap.org", email.to.first
+    assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on one of your notes", email.subject
+    assert_equal first_user.email, email.to.first
 
-    email = ActionMailer::Base.deliveries.find { |e| e.to.first == "public@OpenStreetMap.org" }
+    email = ActionMailer::Base.deliveries.find { |e| e.to.first == second_user.email }
     assert_not_nil email
     assert_equal 1, email.to.length
-    assert_equal "[OpenStreetMap] test2 has commented on a note you are interested in", email.subject
+    assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on a note you are interested in", email.subject
 
     get :show, :id => note_with_comments_by_users.id, :format => "json"
     assert_response :success
@@ -327,7 +342,7 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 4, js["properties"]["comments"].count
     assert_equal "commented", js["properties"]["comments"].last["action"]
     assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
-    assert_equal "test2", js["properties"]["comments"].last["user"]
+    assert_equal third_user.display_name, js["properties"]["comments"].last["user"]
 
     ActionMailer::Base.deliveries.clear
   end
@@ -368,15 +383,21 @@ class NotesControllerTest < ActionController::TestCase
       post :comment, :id => closed_note_with_comment.id, :text => "This is an additional comment"
     end
     assert_response :conflict
+
+    assert_no_difference "NoteComment.count" do
+      post :comment, :id => open_note_with_comment.id, :text => "x\u0000y"
+    end
+    assert_response :bad_request
   end
 
   def test_close_success
     open_note_with_comment = create(:note_with_comments)
+    user = create(:user)
 
     post :close, :id => open_note_with_comment.id, :text => "This is a close comment", :format => "json"
     assert_response :unauthorized
 
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(user.email, "test")
 
     post :close, :id => open_note_with_comment.id, :text => "This is a close comment", :format => "json"
     assert_response :success
@@ -388,7 +409,7 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 2, js["properties"]["comments"].count
     assert_equal "closed", js["properties"]["comments"].last["action"]
     assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
-    assert_equal "test2", js["properties"]["comments"].last["user"]
+    assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
     get :show, :id => open_note_with_comment.id, :format => "json"
     assert_response :success
@@ -400,14 +421,14 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 2, js["properties"]["comments"].count
     assert_equal "closed", js["properties"]["comments"].last["action"]
     assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
-    assert_equal "test2", js["properties"]["comments"].last["user"]
+    assert_equal user.display_name, js["properties"]["comments"].last["user"]
   end
 
   def test_close_fail
     post :close
     assert_response :unauthorized
 
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(create(:user).email, "test")
 
     post :close
     assert_response :bad_request
@@ -428,11 +449,12 @@ class NotesControllerTest < ActionController::TestCase
 
   def test_reopen_success
     closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now)
+    user = create(:user)
 
     post :reopen, :id => closed_note_with_comment.id, :text => "This is a reopen comment", :format => "json"
     assert_response :unauthorized
 
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(user.email, "test")
 
     post :reopen, :id => closed_note_with_comment.id, :text => "This is a reopen comment", :format => "json"
     assert_response :success
@@ -444,7 +466,7 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 2, js["properties"]["comments"].count
     assert_equal "reopened", js["properties"]["comments"].last["action"]
     assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
-    assert_equal "test2", js["properties"]["comments"].last["user"]
+    assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
     get :show, :id => closed_note_with_comment.id, :format => "json"
     assert_response :success
@@ -456,7 +478,7 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 2, js["properties"]["comments"].count
     assert_equal "reopened", js["properties"]["comments"].last["action"]
     assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
-    assert_equal "test2", js["properties"]["comments"].last["user"]
+    assert_equal user.display_name, js["properties"]["comments"].last["user"]
   end
 
   def test_reopen_fail
@@ -465,7 +487,7 @@ class NotesControllerTest < ActionController::TestCase
     post :reopen, :id => hidden_note_with_comment.id
     assert_response :unauthorized
 
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(create(:user).email, "test")
 
     post :reopen, :id => 12345
     assert_response :not_found
@@ -539,7 +561,7 @@ class NotesControllerTest < ActionController::TestCase
         assert_select "time", :count => 1
         assert_select "name", "Note: #{open_note.id}"
         assert_select "desc", :count => 1
-        assert_select "link[href='http://www.openstreetmap.org/note/#{open_note.id}']", :count => 1
+        assert_select "link[href='http://test.host/note/#{open_note.id}']", :count => 1
         assert_select "extensions", :count => 1 do
           assert_select "id", open_note.id.to_s
           assert_select "url", note_url(open_note, :format => "gpx")
@@ -578,16 +600,18 @@ class NotesControllerTest < ActionController::TestCase
 
   def test_destroy_success
     open_note_with_comment = create(:note_with_comments)
+    user = create(:user)
+    moderator_user = create(:moderator_user)
 
     delete :destroy, :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json"
     assert_response :unauthorized
 
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(user.email, "test")
 
     delete :destroy, :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json"
     assert_response :forbidden
 
-    basic_authorization(users(:moderator_user).email, "test")
+    basic_authorization(moderator_user.email, "test")
 
     delete :destroy, :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json"
     assert_response :success
@@ -599,22 +623,25 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 2, js["properties"]["comments"].count
     assert_equal "hidden", js["properties"]["comments"].last["action"]
     assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
-    assert_equal "moderator", js["properties"]["comments"].last["user"]
+    assert_equal moderator_user.display_name, js["properties"]["comments"].last["user"]
 
     get :show, :id => open_note_with_comment.id, :format => "json"
     assert_response :gone
   end
 
   def test_destroy_fail
+    user = create(:user)
+    moderator_user = create(:moderator_user)
+
     delete :destroy, :id => 12345, :format => "json"
     assert_response :unauthorized
 
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(user.email, "test")
 
     delete :destroy, :id => 12345, :format => "json"
     assert_response :forbidden
 
-    basic_authorization(users(:moderator_user).email, "test")
+    basic_authorization(moderator_user.email, "test")
 
     delete :destroy, :id => 12345, :format => "json"
     assert_response :not_found
@@ -933,35 +960,39 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_mine_success
+    first_user = create(:user)
+    second_user = create(:user)
+    moderator_user = create(:moderator_user)
+
     create(:note) do |note|
-      create(:note_comment, :note => note, :author => users(:normal_user))
+      create(:note_comment, :note => note, :author => first_user)
     end
     create(:note) do |note|
-      create(:note_comment, :note => note, :author => users(:second_public_user))
+      create(:note_comment, :note => note, :author => second_user)
     end
     create(:note, :status => "hidden") do |note|
-      create(:note_comment, :note => note, :author => users(:second_public_user))
+      create(:note_comment, :note => note, :author => second_user)
     end
 
     # Note that the table rows include a header row
-    get :mine, :display_name => "test"
+    get :mine, :display_name => first_user.display_name
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
-    get :mine, :display_name => "pulibc_test2"
+    get :mine, :display_name => second_user.display_name
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
     get :mine, :display_name => "non-existent"
     assert_response :not_found
 
-    session[:user] = users(:moderator_user).id
+    session[:user] = moderator_user.id
 
-    get :mine, :display_name => "test"
+    get :mine, :display_name => first_user.display_name
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
-    get :mine, :display_name => "pulibc_test2"
+    get :mine, :display_name => second_user.display_name
     assert_response :success
     assert_select "table.note_list tr", :count => 3