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

[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 68345c6b6b70e8b73a41a93bd81fe51d119dc6e1..40e11a749cf2dff336b9ba37e12012df9fb3a2e3 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
-require "browse_controller"
 
 class BrowseControllerTest < ActionController::TestCase
   ##
@@ -41,6 +40,10 @@ class BrowseControllerTest < ActionController::TestCase
       { :path => "/note/new", :method => :get },
       { :controller => "browse", :action => "new_note" }
     )
+    assert_routing(
+      { :path => "/query", :method => :get },
+      { :controller => "browse", :action => "query" }
+    )
   end
 
   def test_read_relation
@@ -68,8 +71,10 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_changeset
+    user = create(:user)
     private_changeset = create(:changeset, :user => create(:user, :data_public => false))
-    changeset = create(:changeset)
+    changeset = create(:changeset, :user => user)
+    create(:changeset, :user => user)
     browse_check "changeset", private_changeset.id, "browse/changeset"
     browse_check "changeset", changeset.id, "browse/changeset"
   end
@@ -126,6 +131,21 @@ class BrowseControllerTest < ActionController::TestCase
     assert_select "div.note-comments ul li", :count => 2
   end
 
+  def test_read_note_hidden_user_comment
+    hidden_user = create(:user, :status => "deleted")
+    note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note|
+      create(:note_comment, :note => note, :author => hidden_user)
+    end
+
+    browse_check "note", note_with_hidden_user_comment.id, "browse/note"
+    assert_select "div.note-comments ul li", :count => 1
+
+    session[:user] = create(:moderator_user).id
+
+    browse_check "note", note_with_hidden_user_comment.id, "browse/note"
+    assert_select "div.note-comments ul li", :count => 1
+  end
+
   ##
   #  Methods to check redaction.
   #
@@ -204,6 +224,18 @@ class BrowseControllerTest < ActionController::TestCase
     assert_select ".browse-section.browse-relation", 2
   end
 
+  def test_new_note
+    get :new_note
+    assert_response :success
+    assert_template "browse/new_note"
+  end
+
+  def test_query
+    get :query
+    assert_response :success
+    assert_template "browse/query"
+  end
+
   private
 
   # This is a convenience method for most of the above checks