cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pull/5484'

Browse source
This commit is contained in:
Anton Khorev 2025-01-09 17:20:25 +03:00
commit 45abfe49e1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/diary_entries_controller.rb
View file

@ -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

6
test/controllers/diary_entries_controller_test.rb
View file

@ -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