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

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

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 5e60ee0f0c6f6b5448c43ee562cd5534b2fe7040..9aee867a9c498353b9b868236f3be363feb54265 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -33,7 +33,7 @@ class IssuesTest < ApplicationSystemTestCase
   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)
+    issue = create(:issue, :reportable => anonymous_note, :assigned_role => "moderator")
 
     visit issues_path
     assert page.has_content?(reportable_title(anonymous_note))
@@ -53,6 +53,7 @@ class IssuesTest < ApplicationSystemTestCase
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     click_on "Search"
+    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
@@ -60,12 +61,14 @@ class IssuesTest < ApplicationSystemTestCase
     fill_in "search_by_user", :with => "Nonexistant User"
     click_on "Search"
     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"
-    assert !page.has_content?(I18n.t("issues.index.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