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

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

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index d9f4401bfbf83e61ddd5d6a54c944e715754a816..cde9403d00bdec89b56e3cb069f4f8ded7766cc3 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -63,7 +63,15 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_read_node
   end
 
   def test_read_node

-    browse_check :node_path, create(:node).id, "browse/feature"
+    node = create :node
+    browse_check :node_path, node.id, "browse/feature"
+    assert_select "a[href='#{api_node_path node}']", :count => 1
+  end
+
+  def test_read_deleted_node
+    node = create :node, :visible => false
+    browse_check :node_path, node.id, "browse/feature"
+    assert_select "a[href='#{api_node_path node}']", :count => 0

   end
 
   def test_read_node_history
   end
 
   def test_read_node_history


@@ -137,7 +145,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_read_note_hidden_user_comment
   end
 
   def test_read_note_hidden_user_comment

-    hidden_user = create(:user, :status => "deleted")
+    hidden_user = create(:user, :deleted)

     note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note|
       create(:note_comment, :note => note, :author => hidden_user)
     end
     note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note|
       create(:note_comment, :note => note, :author => hidden_user)
     end


@@ -153,7 +161,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_closed_note
     user = create(:user)
 
   def test_read_closed_note
     user = create(:user)

-    closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now, :comments_count => 2) do |note|
+    closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc, :comments_count => 2) do |note|

       create(:note_comment, :event => "closed", :note => note, :author => user)
     end
 
       create(:note_comment, :event => "closed", :note => note, :author => user)
     end
 


@@ -161,7 +169,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
     assert_select "div.note-comments ul li", :count => 2
     assert_select "div.details", /Resolved by #{user.display_name}/
 
     assert_select "div.note-comments ul li", :count => 2
     assert_select "div.details", /Resolved by #{user.display_name}/
 

-    user.destroy
+    user.soft_destroy!

 
     reset!
 
 
     reset!