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

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

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index a961ea80f7a54099597920e2073c0055a573cad9..e26ae89ac6556cbec289f25e52ed445ac98e33b6 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -114,15 +114,15 @@ class IssuesTest < ApplicationSystemTestCase
     assert_equal("test comment", issue.comments.first.body)
   end
 
     assert_equal("test comment", issue.comments.first.body)
   end
 

-  def test_reassign_issue
-    issue = create(:issue)
-    assert_equal "administrator", issue.assigned_role
+  def test_reassign_issue_to_moderators
+    issue = create(:issue, :assigned_role => "administrator")

     sign_in_as(create(:administrator_user))
 
     visit issue_path(issue)
 
     sign_in_as(create(:administrator_user))
 
     visit issue_path(issue)
 

+    assert_unchecked_field "Reassign Issue to Moderators"

     fill_in :issue_comment_body, :with => "reassigning to moderators"
     fill_in :issue_comment_body, :with => "reassigning to moderators"

-    check :reassign
+    check "Reassign Issue to Moderators"

     click_on "Add Comment"
 
     assert_content "and the issue was reassigned"
     click_on "Add Comment"
 
     assert_content "and the issue was reassigned"


@@ -132,6 +132,24 @@ class IssuesTest < ApplicationSystemTestCase
     assert_equal "moderator", issue.assigned_role
   end
 
     assert_equal "moderator", issue.assigned_role
   end
 

+  def test_reassign_issue_to_administrators
+    issue = create(:issue, :assigned_role => "moderator")
+    sign_in_as(create(:moderator_user))
+
+    visit issue_path(issue)
+
+    assert_unchecked_field "Reassign Issue to Administrators"
+    fill_in :issue_comment_body, :with => "reassigning to administrators"
+    check "Reassign Issue to Administrators"
+    click_on "Add Comment"
+
+    assert_content "and the issue was reassigned"
+    assert_current_path issues_path(:status => "open")
+
+    issue.reload
+    assert_equal "administrator", issue.assigned_role
+  end
+

   def test_reassign_issue_as_super_user
     issue = create(:issue)
     sign_in_as(create(:super_user))
   def test_reassign_issue_as_super_user
     issue = create(:issue)
     sign_in_as(create(:super_user))


@@ -139,7 +157,7 @@ class IssuesTest < ApplicationSystemTestCase
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"

-    check :reassign
+    check "Reassign Issue to Moderators"

     click_on "Add Comment"
 
     assert_content "and the issue was reassigned"
     click_on "Add Comment"
 
     assert_content "and the issue was reassigned"