Merge remote-tracking branch 'upstream/pull/1926'

[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 1254c4fb5305d11076433ec535d31cabacac27ca..5f449f0d6ddc1b8769675ab738d2fe8b602443f5 100644 (file)
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -222,6 +222,8 @@ module Api
 
     def test_comment_success
       open_note_with_comment = create(:note_with_comments)
+      user = create(:user)
+      basic_authorization user.email, "test"
       assert_difference "NoteComment.count", 1 do
         assert_no_difference "ActionMailer::Base.deliveries.size" do
           perform_enqueued_jobs do
@@ -238,7 +240,7 @@ module Api
       assert_equal 2, 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_nil js["properties"]["comments"].last["user"]
+      assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
       get :show, :params => { :id => open_note_with_comment.id, :format => "json" }
       assert_response :success
@@ -250,7 +252,7 @@ module Api
       assert_equal 2, 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_nil js["properties"]["comments"].last["user"]
+      assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
       # Ensure that emails are sent to users
       first_user = create(:user)
@@ -261,47 +263,6 @@ module Api
         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
-          perform_enqueued_jobs do
-            post :comment, :params => { :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json" }
-          end
-        end
-      end
-      assert_response :success
-      js = ActiveSupport::JSON.decode(@response.body)
-      assert_not_nil js
-      assert_equal "Feature", js["type"]
-      assert_equal note_with_comments_by_users.id, js["properties"]["id"]
-      assert_equal "open", js["properties"]["status"]
-      assert_equal 3, 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_nil js["properties"]["comments"].last["user"]
-
-      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 == 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
-
-      get :show, :params => { :id => note_with_comments_by_users.id, :format => "json" }
-      assert_response :success
-      js = ActiveSupport::JSON.decode(@response.body)
-      assert_not_nil js
-      assert_equal "Feature", js["type"]
-      assert_equal note_with_comments_by_users.id, js["properties"]["id"]
-      assert_equal "open", js["properties"]["status"]
-      assert_equal 3, 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_nil js["properties"]["comments"].last["user"]
-
-      ActionMailer::Base.deliveries.clear
 
       basic_authorization third_user.email, "test"
 
@@ -318,7 +279,7 @@ module Api
       assert_equal "Feature", js["type"]
       assert_equal note_with_comments_by_users.id, js["properties"]["id"]
       assert_equal "open", js["properties"]["status"]
-      assert_equal 4, js["properties"]["comments"].count
+      assert_equal 3, 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 third_user.display_name, js["properties"]["comments"].last["user"]
@@ -341,7 +302,7 @@ module Api
       assert_equal "Feature", js["type"]
       assert_equal note_with_comments_by_users.id, js["properties"]["id"]
       assert_equal "open", js["properties"]["status"]
-      assert_equal 4, js["properties"]["comments"].count
+      assert_equal 3, 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 third_user.display_name, js["properties"]["comments"].last["user"]
@@ -352,6 +313,15 @@ module Api
     def test_comment_fail
       open_note_with_comment = create(:note_with_comments)
 
+      user = create(:user)
+
+      assert_no_difference "NoteComment.count" do
+        post :comment, :params => { :text => "This is an additional comment" }
+        assert_response :unauthorized
+      end
+
+      basic_authorization user.email, "test"
+
       assert_no_difference "NoteComment.count" do
         post :comment, :params => { :text => "This is an additional comment" }
       end