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

[rails.git] / test / controllers / redactions_controller_test.rb

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index 73061ed57243af4913a5a73e903dc843001fc3ae..b3bc4cf16f92900218605d4276b5141d18b76e8f 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,7 +1,6 @@
 require "test_helper"
 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
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -38,7 +37,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_index
     create(:redaction)
 
   def test_index
     create(:redaction)
 

-    get :index
+    get redactions_path

     assert_response :success
     assert_template :index
     assert_select "ul#redaction_list", 1 do
     assert_response :success
     assert_template :index
     assert_select "ul#redaction_list", 1 do


@@ -46,131 +45,132 @@ class RedactionsControllerTest < ActionController::TestCase
     end
   end
 
     end
   end
 

+  def test_show
+    redaction = create(:redaction, :title => "tested-redaction")
+
+    get redaction_path(redaction)
+    assert_response :success
+    assert_dom "h1", :text => /tested-redaction/
+    assert_dom "a[href='#{user_path redaction.user}']", :text => redaction.user.display_name
+  end
+

   def test_new
   def test_new

-    get :new
-    assert_response :redirect
+    get new_redaction_path

     assert_redirected_to login_path(:referer => new_redaction_path)
   end
 
   def test_new_moderator
     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
     assert_response :success
     assert_template :new
   end
 
   def test_new_non_moderator

-    session[:user] = create(:user).id
+    session_for(create(:user))

 
 

-    get :new
-    assert_response :redirect
-    assert_redirected_to redactions_path
+    get new_redaction_path
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_create_moderator
   end
 
   def test_create_moderator

-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))

 
 

-    post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }
-    assert_response :redirect
+    post redactions_path(:redaction => { :title => "Foo", :description => "Description here." })

     assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   end
 
   def test_create_moderator_invalid
     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, :params => { :redaction => { :title => "Foo", :description => "" } }
+    post redactions_path(:redaction => { :title => "Foo", :description => "" })

     assert_response :success
     assert_template :new
   end
 
   def test_create_non_moderator
     assert_response :success
     assert_template :new
   end
 
   def test_create_non_moderator

-    session[:user] = create(:user).id
+    session_for(create(:user))

 
 

-    post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }
-    assert_response :forbidden
+    post redactions_path(:redaction => { :title => "Foo", :description => "Description here." })
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_destroy_moderator_empty
   end
 
   def test_destroy_moderator_empty

-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))

 
     # create an empty redaction
     redaction = create(:redaction)
 
 
     # create an empty redaction
     redaction = create(:redaction)
 

-    delete :destroy, :params => { :id => redaction.id }
-    assert_response :redirect
+    delete redaction_path(redaction)

     assert_redirected_to(redactions_path)
   end
 
   def test_destroy_moderator_non_empty
     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)
 
 
     # create elements in the redaction
     redaction = create(:redaction)
     create(:old_node, :redaction => redaction)
 

-    delete :destroy, :params => { :id => redaction.id }
-    assert_response :redirect
+    delete redaction_path(redaction)

     assert_redirected_to(redaction_path(redaction))
     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
   end
 
   def test_delete_non_moderator

-    session[:user] = create(:user).id
+    session_for(create(:user))

 
 

-    delete :destroy, :params => { :id => create(:redaction).id }
-    assert_response :forbidden
+    delete redaction_path(create(:redaction))
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_edit
     redaction = create(:redaction)
 
   end
 
   def test_edit
     redaction = create(:redaction)
 

-    get :edit, :params => { :id => redaction.id }
-    assert_response :redirect
+    get edit_redaction_path(redaction)

     assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
 
   def test_edit_moderator
     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, :params => { :id => create(:redaction).id }
+    get edit_redaction_path(create(:redaction))

     assert_response :success
   end
 
   def test_edit_non_moderator
     assert_response :success
   end
 
   def test_edit_non_moderator

-    session[:user] = create(:user).id
+    session_for(create(:user))

 
 

-    get :edit, :params => { :id => create(:redaction).id }
-    assert_response :redirect
-    assert_redirected_to(redactions_path)
+    get edit_redaction_path(create(:redaction))
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_update_moderator
   end
 
   def test_update_moderator

-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))

 
     redaction = create(:redaction)
 
 
     redaction = create(:redaction)
 

-    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }
-    assert_response :redirect
+    put redaction_path(redaction, :redaction => { :title => "Foo", :description => "Description here." })

     assert_redirected_to(redaction_path(redaction))
   end
 
   def test_update_moderator_invalid
     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)
 
 
     redaction = create(:redaction)
 

-    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "" } }
+    put redaction_path(redaction, :redaction => { :title => "Foo", :description => "" })

     assert_response :success
     assert_template :edit
   end
 
   def test_updated_non_moderator
     assert_response :success
     assert_template :edit
   end
 
   def test_updated_non_moderator

-    session[:user] = create(:user).id
+    session_for(create(:user))

 
     redaction = create(:redaction)
 
 
     redaction = create(:redaction)
 

-    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }
-    assert_response :forbidden
+    put redaction_path(redaction, :redaction => { :title => "Foo", :description => "Description here." })
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 end
   end
 end