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

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

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index f539dd739052fb844b5fc37d32504fa86a1c8236..a40306e3c7b1a5064770d8bdbd345eff47750672 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -80,21 +80,21 @@ class IssuesTest < ApplicationSystemTestCase
     # No issues against the user
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     # No issues against the user
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name

-    click_on "Search"
+    click_button "Search"

     assert_no_content I18n.t("issues.index.user_not_found")
     assert_content I18n.t("issues.index.issues_not_found")
 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistent User"
     assert_no_content I18n.t("issues.index.user_not_found")
     assert_content I18n.t("issues.index.issues_not_found")
 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistent User"

-    click_on "Search"
+    click_button "Search"

     assert_content I18n.t("issues.index.user_not_found")
     assert_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
     assert_content I18n.t("issues.index.user_not_found")
     assert_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"
+    click_button "Search"

     assert_no_content I18n.t("issues.index.user_not_found")
     assert_no_content I18n.t("issues.index.issues_not_found")
   end
     assert_no_content I18n.t("issues.index.user_not_found")
     assert_no_content I18n.t("issues.index.issues_not_found")
   end


@@ -106,7 +106,7 @@ class IssuesTest < ApplicationSystemTestCase
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"

-    click_on "Add Comment"
+    click_button "Add Comment"

     assert_content I18n.t("issue_comments.create.comment_created")
     assert_content "test comment"
 
     assert_content I18n.t("issue_comments.create.comment_created")
     assert_content "test comment"
 


@@ -123,12 +123,29 @@ 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 "Add Comment"
+    click_button "Add Comment"
+
+    assert_content "and the issue was reassigned"
+    assert_current_path issues_path(:status => "open")

 
     issue.reload
     assert_equal "moderator", issue.assigned_role
   end
 
 
     issue.reload
     assert_equal "moderator", issue.assigned_role
   end
 

+  def test_reassign_issue_as_super_user
+    issue = create(:issue)
+    sign_in_as(create(:super_user))
+
+    visit issue_path(issue)
+
+    fill_in :issue_comment_body, :with => "reassigning to moderators"
+    check :reassign
+    click_button "Add Comment"
+
+    assert_content "and the issue was reassigned"
+    assert_current_path issue_path(issue)
+  end
+

   def test_issue_index_with_multiple_roles
     user1 = create(:user)
     user2 = create(:user)
   def test_issue_index_with_multiple_roles
     user1 = create(:user)
     user2 = create(:user)