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

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 760c9a301248d5bba8ff9b03ca7540e2d31d875d..27099cd9cf9835558624088b34568b0fa9e587fa 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -123,7 +123,7 @@ class DiaryEntriesController < ApplicationController
       # Subscribe user to diary comments
       @diary_entry.subscriptions.create(:user => current_user)
 
-      redirect_to :action => "index", :display_name => current_user.display_name
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
     else
       render :action => "new"
     end

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 91e2a58d94146b73682157cf5b7d33611c9c621b..a1c22fff8237e4dc356aca4f9e15dc792d4c4c95 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -159,8 +159,8 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
       post diary_entries_path(:diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
                                                 :longitude => "2.2", :language_code => "en" })
     end
-    assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.last
+    assert_redirected_to diary_entry_path(user, entry)
     assert_equal user.id, entry.user_id
     assert_equal "New Title", entry.title
     assert_equal "This is a new body for the diary entry", entry.body
@@ -184,8 +184,8 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
       post diary_entries_path(:diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
                                                 :longitude => "2.2", :language_code => "de" })
     end
-    assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.last
+    assert_redirected_to diary_entry_path(user, entry)
     assert_equal user.id, entry.user_id
     assert_equal "New Title", entry.title
     assert_equal "This is a new body for the diary entry", entry.body
@@ -211,8 +211,8 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     assert_difference "DiaryEntry.count", 1 do
       post diary_entries_path(:diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" })
     end
-    assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.last
+    assert_redirected_to diary_entry_path(user, entry)
     assert_equal user.id, entry.user_id
     assert_equal spammy_title, entry.title
     assert_equal spammy_body, entry.body