Merge branch 'pull/4957'

[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 be5a88fdc977e3dbe11580220287551b9a51e168..5ca72fe478263bde3b0234638990f1fc13ad8d92 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -45,9 +45,17 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     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
     get new_redaction_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => new_redaction_path)
   end
 
@@ -63,7 +71,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:user))
 
     get new_redaction_path
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
@@ -71,7 +78,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:moderator_user))
 
     post redactions_path(:redaction => { :title => "Foo", :description => "Description here." })
-    assert_response :redirect
     assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   end
 
@@ -87,7 +93,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:user))
 
     post redactions_path(:redaction => { :title => "Foo", :description => "Description here." })
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
@@ -98,7 +103,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     redaction = create(:redaction)
 
     delete redaction_path(:id => redaction)
-    assert_response :redirect
     assert_redirected_to(redactions_path)
   end
 
@@ -110,7 +114,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     create(:old_node, :redaction => redaction)
 
     delete redaction_path(:id => redaction)
-    assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
     assert_match(/^Redaction is not empty/, flash[:error])
   end
@@ -119,7 +122,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:user))
 
     delete redaction_path(:id => create(:redaction))
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
@@ -127,7 +129,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     redaction = create(:redaction)
 
     get edit_redaction_path(:id => redaction)
-    assert_response :redirect
     assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
 
@@ -142,7 +143,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:user))
 
     get edit_redaction_path(:id => create(:redaction))
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
@@ -152,7 +152,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     redaction = create(:redaction)
 
     put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." })
-    assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
   end
 
@@ -172,7 +171,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     redaction = create(:redaction)
 
     put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." })
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 end