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

[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 c2f44801c02283e2252b68e1f9b7ae511f18fbff..a1c32333224337f95e238c024d540fa222d1fb42 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -228,7 +228,9 @@ class NotesControllerTest < ActionController::TestCase
     open_note_with_comment = create(:note_with_comments)
     assert_difference "NoteComment.count", 1 do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
-        post :comment, :params => { :id => open_note_with_comment.id, :text => "This is an additional comment", :format => "json" }
+        perform_enqueued_jobs do
+          post :comment, :params => { :id => open_note_with_comment.id, :text => "This is an additional comment", :format => "json" }
+        end
       end
     end
     assert_response :success
@@ -265,7 +267,9 @@ class NotesControllerTest < ActionController::TestCase
     end
     assert_difference "NoteComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 2 do
-        post :comment, :params => { :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json" }
+        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
@@ -307,7 +311,9 @@ class NotesControllerTest < ActionController::TestCase
 
     assert_difference "NoteComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 2 do
-        post :comment, :params => { :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json" }
+        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
@@ -915,21 +921,21 @@ class NotesControllerTest < ActionController::TestCase
     end
   end
 
-  def test_search_by_id_success
+  def test_search_by_user_success
     user = create(:user)
 
     create(:note) do |note|
       create(:note_comment, :note => note, :author => user)
     end
 
-    get :search, :params => { :id => user.id, :format => "xml" }
+    get :search, :params => { :user => user.id, :format => "xml" }
     assert_response :success
     assert_equal "application/xml", @response.content_type
     assert_select "osm", :count => 1 do
       assert_select "note", :count => 1
     end
 
-    get :search, :params => { :id => user.id, :format => "json" }
+    get :search, :params => { :user => user.id, :format => "json" }
     assert_response :success
     assert_equal "application/json", @response.content_type
     js = ActiveSupport::JSON.decode(@response.body)
@@ -937,7 +943,7 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal "FeatureCollection", js["type"]
     assert_equal 1, js["features"].count
 
-    get :search, :params => { :id => user.id, :format => "rss" }
+    get :search, :params => { :user => user.id, :format => "rss" }
     assert_response :success
     assert_equal "application/rss+xml", @response.content_type
     assert_select "rss", :count => 1 do
@@ -946,7 +952,7 @@ class NotesControllerTest < ActionController::TestCase
       end
     end
 
-    get :search, :params => { :id => user.id, :format => "gpx" }
+    get :search, :params => { :user => user.id, :format => "gpx" }
     assert_response :success
     assert_equal "application/gpx+xml", @response.content_type
     assert_select "gpx", :count => 1 do
@@ -1034,7 +1040,7 @@ class NotesControllerTest < ActionController::TestCase
     get :search, :params => { :display_name => "non-existent" }
     assert_response :bad_request
 
-    get :search, :params => { :id => "-1" }
+    get :search, :params => { :user => "-1" }
     assert_response :bad_request
 
     get :search, :params => { :from => "wrong-date", :to => "wrong-date" }