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

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

Browse source
This commit is contained in:
Tom Hughes 2018-11-08 17:51:23 +00:00
commit 6ca22de4f2
5 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/controllers/redactions_controller_test.rb
View file

@ -63,8 +63,7 @@ class RedactionsControllerTest < ActionController::TestCase
session[:user] = create(:user).id
get :new
assert_response :redirect
assert_redirected_to redactions_path
assert_response :forbidden
end
def test_create_moderator
@ -140,8 +139,7 @@ class RedactionsControllerTest < ActionController::TestCase
session[:user] = create(:user).id
get :edit, :params => { :id => create(:redaction).id }
assert_response :redirect
assert_redirected_to(redactions_path)
assert_response :forbidden
end
def test_update_moderator

9
test/controllers/user_blocks_controller_test.rb
View file

@ -145,8 +145,7 @@ class UserBlocksControllerTest < ActionController::TestCase
# Check that normal users can't load the block creation page
get :new, :params => { :display_name => target_user.display_name }
assert_redirected_to user_blocks_path
assert_equal "You need to be a moderator to perform that action.", flash[:error]
assert_response :forbidden
# Login as a moderator
session[:user] = create(:moderator_user).id
@ -189,8 +188,7 @@ class UserBlocksControllerTest < ActionController::TestCase
# Check that normal users can't load the block edit page
get :edit, :params => { :id => active_block.id }
assert_redirected_to user_blocks_path
assert_equal "You need to be a moderator to perform that action.", flash[:error]
assert_response :forbidden
# Login as a moderator
session[:user] = create(:moderator_user).id
@ -361,8 +359,7 @@ class UserBlocksControllerTest < ActionController::TestCase
# Check that normal users can't load the block revoke page
get :revoke, :params => { :id => active_block.id }
assert_redirected_to user_blocks_path
assert_equal "You need to be a moderator to perform that action.", flash[:error]
assert_response :forbidden
# Login as a moderator
session[:user] = create(:moderator_user).id