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

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

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index f11b05a2d50fad0a2ccd07d6a17482419a40124a..4c84d44fcd68c6a7404a18fdf371350a49365448 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -3,18 +3,23 @@ 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("sessions.new.title"))
+  end
+
   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?("Forbidden")
   end
 
   def test_view_no_issues
     sign_in_as(create(:moderator_user))
 
     visit issues_path
-    assert page.has_content?(I18n.t(".issues.index.issues_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))
   end
 
   def test_view_issues
@@ -28,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))
@@ -48,34 +53,37 @@ class IssuesTest < ApplicationSystemTestCase
     visit issues_path
     fill_in "search_by_user", :with => good_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 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"
-    assert page.has_content?(I18n.t(".issues.index.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"
-    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
-    issue = create(:issue)
+    issue = create(:issue, :assigned_role => "moderator")
     sign_in_as(create(:moderator_user))
 
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"
-    click_on "Submit"
-    assert page.has_content?(I18n.t(".issues.comment.comment_created"))
+    click_on "Add Comment"
+    assert page.has_content?(I18n.t("issue_comments.create.comment_created"))
     assert page.has_content?("test comment")
 
     issue.reload
-    assert_equal issue.comments.first.body, "test comment"
+    assert_equal("test comment", issue.comments.first.body)
   end
 
   def test_reassign_issue
@@ -87,7 +95,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign
-    click_on "Submit"
+    click_on "Add Comment"
 
     issue.reload
     assert_equal "moderator", issue.assigned_role
@@ -105,7 +113,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     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