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 3cecf58d99d07dd938301292bb043dc70ac63a77..4c84d44fcd68c6a7404a18fdf371350a49365448 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -5,14 +5,14 @@ class IssuesTest < ApplicationSystemTestCase
 
   def test_view_issues_not_logged_in
     visit issues_path
 
   def test_view_issues_not_logged_in
     visit issues_path

-    assert page.has_content?(I18n.t("user.login.title"))
+    assert page.has_content?(I18n.t("sessions.new.title"))

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

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

   end
 
   def test_view_no_issues
   end
 
   def test_view_no_issues


@@ -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)
   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))
 
     visit issues_path
     assert page.has_content?(reportable_title(anonymous_note))


@@ -72,18 +72,18 @@ class IssuesTest < ApplicationSystemTestCase
   end
 
   def test_commenting
   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"
     sign_in_as(create(:moderator_user))
 
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"

-    click_on "Submit"
+    click_on "Add Comment"

     assert page.has_content?(I18n.t("issue_comments.create.comment_created"))
     assert page.has_content?("test comment")
 
     issue.reload
     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
   end
 
   def test_reassign_issue


@@ -95,7 +95,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign
 
     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
 
     issue.reload
     assert_equal "moderator", issue.assigned_role