X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f22098f3b76d39e471b72659172f9e374549fa85..d5d92e60564dcd322a736c4bd3ddf831631d9c0e:/test/controllers/redactions_controller_test.rb

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index 750f7c9d1..be5a88fdc 100644
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,7 +1,6 @@
 require "test_helper"
-require "redactions_controller"
 
-class RedactionsControllerTest < ActionController::TestCase
+class RedactionsControllerTest < ActionDispatch::IntegrationTest
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -38,7 +37,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_index
     create(:redaction)
 
-    get :index
+    get redactions_path
     assert_response :success
     assert_template :index
     assert_select "ul#redaction_list", 1 do
@@ -47,130 +46,133 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_new
-    get :new
+    get new_redaction_path
     assert_response :redirect
     assert_redirected_to login_path(:referer => new_redaction_path)
   end
 
   def test_new_moderator
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
-    get :new
+    get new_redaction_path
     assert_response :success
     assert_template :new
   end
 
   def test_new_non_moderator
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
-    get :new
+    get new_redaction_path
     assert_response :redirect
-    assert_redirected_to redactions_path
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_create_moderator
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
-    post :create, :redaction => { :title => "Foo", :description => "Description here." }
+    post redactions_path(:redaction => { :title => "Foo", :description => "Description here." })
     assert_response :redirect
     assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   end
 
   def test_create_moderator_invalid
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
-    post :create, :redaction => { :title => "Foo", :description => "" }
+    post redactions_path(:redaction => { :title => "Foo", :description => "" })
     assert_response :success
     assert_template :new
   end
 
   def test_create_non_moderator
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
-    post :create, :redaction => { :title => "Foo", :description => "Description here." }
-    assert_response :forbidden
+    post redactions_path(:redaction => { :title => "Foo", :description => "Description here." })
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_destroy_moderator_empty
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
     # create an empty redaction
     redaction = create(:redaction)
 
-    delete :destroy, :id => redaction.id
+    delete redaction_path(:id => redaction)
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end
 
   def test_destroy_moderator_non_empty
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
     # create elements in the redaction
     redaction = create(:redaction)
     create(:old_node, :redaction => redaction)
 
-    delete :destroy, :id => redaction.id
+    delete redaction_path(:id => redaction)
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
-    assert_match /^Redaction is not empty/, flash[:error]
+    assert_match(/^Redaction is not empty/, flash[:error])
   end
 
   def test_delete_non_moderator
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
-    delete :destroy, :id => create(:redaction).id
-    assert_response :forbidden
+    delete redaction_path(:id => create(:redaction))
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_edit
     redaction = create(:redaction)
 
-    get :edit, :id => redaction.id
+    get edit_redaction_path(:id => redaction)
     assert_response :redirect
     assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
 
   def test_edit_moderator
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
-    get :edit, :id => create(:redaction).id
+    get edit_redaction_path(:id => create(:redaction))
     assert_response :success
   end
 
   def test_edit_non_moderator
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
-    get :edit, :id => create(:redaction).id
+    get edit_redaction_path(:id => create(:redaction))
     assert_response :redirect
-    assert_redirected_to(redactions_path)
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_update_moderator
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
     redaction = create(:redaction)
 
-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
+    put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." })
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
   end
 
   def test_update_moderator_invalid
-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))
 
     redaction = create(:redaction)
 
-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "" }
+    put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "" })
     assert_response :success
     assert_template :edit
   end
 
   def test_updated_non_moderator
-    session[:user] = create(:user).id
+    session_for(create(:user))
 
     redaction = create(:redaction)
 
-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
-    assert_response :forbidden
+    put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." })
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 end