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

Allow administrators to unhide diary entries, if they wish

Browse source
This commit is contained in:
Andy Allan 2019-06-05 15:29:47 +02:00
parent cf7c8a0cd0
commit f2f3fbb1f1
6 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

31
test/controllers/diary_entries_controller_test.rb
View file

@ -85,6 +85,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase
{ :path => "/user/username/diary/1/hide", :method => :post },
{ :controller => "diary_entries", :action => "hide", :display_name => "username", :id => "1" }
)
assert_routing(
{ :path => "/user/username/diary/1/unhide", :method => :post },
{ :controller => "diary_entries", :action => "unhide", :display_name => "username", :id => "1" }
)
assert_routing(
{ :path => "/user/username/diary/1/hidecomment/2", :method => :post },
{ :controller => "diary_entries", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" }
@ -750,6 +754,33 @@ class DiaryEntriesControllerTest < ActionController::TestCase
assert_equal false, DiaryEntry.find(diary_entry.id).visible
end
def test_unhide
user = create(:user)
# Try without logging in
diary_entry = create(:diary_entry, :user => user, :visible => false)
post :unhide,
:params => { :display_name => user.display_name, :id => diary_entry.id }
assert_response :forbidden
assert_equal false, DiaryEntry.find(diary_entry.id).visible
# Now try as a normal user
post :unhide,
:params => { :display_name => user.display_name, :id => diary_entry.id },
:session => { :user => user }
assert_response :redirect
assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal false, DiaryEntry.find(diary_entry.id).visible
# Finally try as an administrator
post :unhide,
:params => { :display_name => user.display_name, :id => diary_entry.id },
:session => { :user => create(:administrator_user) }
assert_response :redirect
assert_redirected_to :action => :index, :display_name => user.display_name
assert_equal true, DiaryEntry.find(diary_entry.id).visible
end
def test_hidecomment
user = create(:user)
administrator_user = create(:administrator_user)