From: Tom Hughes <tom@compton.nu>
Date: Thu, 8 Nov 2018 17:51:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2051'
X-Git-Tag: live~2875
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6ca22de4f2c68e4b14a6e2f0938a8657c33adc31?hp=-c

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

6ca22de4f2c68e4b14a6e2f0938a8657c33adc31
diff --combined test/controllers/redactions_controller_test.rb
index 0bf57c310,08f32d4d0..fa56814b2
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@@ -1,4 -1,5 +1,4 @@@
  require "test_helper"
 -require "redactions_controller"
  
  class RedactionsControllerTest < ActionController::TestCase
    ##
@@@ -63,8 -64,7 +63,7 @@@
      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 -140,7 +139,7 @@@
      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