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

[rails.git] / test / system / issues_test.rb

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 545074c3040c223113b128915c795ffc3096a916..138de272168e1289c52297b0648b43934b9e0019 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -1,18 +1,25 @@
 require "application_system_test_case"
 
 class IssuesTest < ApplicationSystemTestCase
 require "application_system_test_case"
 
 class IssuesTest < ApplicationSystemTestCase

+  include IssuesHelper
+
+  def test_view_issues_not_logged_in
+    visit issues_path
+    assert page.has_content?(I18n.t("users.login.title"))
+  end
+

   def test_view_issues_normal_user
     sign_in_as(create(:user))
 
     visit issues_path
   def test_view_issues_normal_user
     sign_in_as(create(:user))
 
     visit issues_path

-    assert page.has_content?(I18n.t("application.require_admin.not_an_admin"))
+    assert page.has_content?(I18n.t("application.require_moderator_or_admin.not_a_moderator_or_admin"))

   end
 
   def test_view_no_issues
     sign_in_as(create(:moderator_user))
 
     visit issues_path
   end
 
   def test_view_no_issues
     sign_in_as(create(:moderator_user))
 
     visit issues_path

-    assert page.has_content?(I18n.t(".issues.index.search.issues_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))

   end
 
   def test_view_issues
   end
 
   def test_view_issues


@@ -23,6 +30,18 @@ class IssuesTest < ApplicationSystemTestCase
     assert page.has_content?(issues.first.reported_user.display_name)
   end
 
     assert page.has_content?(issues.first.reported_user.display_name)
   end
 

+  def test_view_issues_with_no_reported_user
+    sign_in_as(create(:moderator_user))
+    anonymous_note = create(:note_with_comments)
+    issue = create(:issue, :reportable => anonymous_note, :assigned_role => "moderator")
+
+    visit issues_path
+    assert page.has_content?(reportable_title(anonymous_note))
+
+    visit issue_path(issue)
+    assert page.has_content?(reportable_title(anonymous_note))
+  end
+

   def test_search_issues_by_user
     good_user = create(:user)
     bad_user = create(:user)
   def test_search_issues_by_user
     good_user = create(:user)
     bad_user = create(:user)


@@ -34,19 +53,22 @@ class IssuesTest < ApplicationSystemTestCase
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     click_on "Search"
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     click_on "Search"

-    assert page.has_content?(I18n.t(".issues.index.search.issues_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))

 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistant User"
     click_on "Search"
 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistant User"
     click_on "Search"

-    assert page.has_content?(I18n.t(".issues.index.search.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))

 
     # Find Issue against bad_user
     visit issues_path
     fill_in "search_by_user", :with => bad_user.display_name
     click_on "Search"
 
     # Find Issue against bad_user
     visit issues_path
     fill_in "search_by_user", :with => bad_user.display_name
     click_on "Search"

-    assert !page.has_content?(I18n.t(".issues.index.search.issues_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.issues_not_found"))

   end
 
   def test_commenting
   end
 
   def test_commenting


@@ -57,7 +79,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     fill_in :issue_comment_body, :with => "test comment"
     click_on "Submit"
 
     fill_in :issue_comment_body, :with => "test comment"
     click_on "Submit"

-    assert page.has_content?(I18n.t(".issues.comment.comment_created"))
+    assert page.has_content?(I18n.t("issue_comments.create.comment_created"))

     assert page.has_content?("test comment")
 
     issue.reload
     assert page.has_content?("test comment")
 
     issue.reload


@@ -91,7 +113,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     visit issues_path
 
 
     visit issues_path
 

-    assert page.has_link?(user1.display_name, :href => issue_path(issue1))
-    assert page.has_link?(user2.display_name, :href => issue_path(issue2))
+    assert page.has_link?(I18n.t("issues.index.reports_count", :count => issue1.reports_count), :href => issue_path(issue1))
+    assert page.has_link?(I18n.t("issues.index.reports_count", :count => issue2.reports_count), :href => issue_path(issue2))

   end
 end
   end
 end