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

[rails.git] / test / models / issue_test.rb

diff --git a/test/models/issue_test.rb b/test/models/issue_test.rb
index 4203d02c1a84d17092da3796644eb064971cf41e..b2a868a93f7d62e94576f7abee33155165a1d2af 100644 (file)
--- a/test/models/issue_test.rb
+++ b/test/models/issue_test.rb
@@ -4,9 +4,9 @@ class IssueTest < ActiveSupport::TestCase
   def test_assigned_role
     issue = create(:issue)
 
-    assert issue.valid?
+    assert_predicate issue, :valid?
     issue.assigned_role = "bogus"
-    assert_not issue.valid?
+    assert_not_predicate issue, :valid?
   end
 
   def test_reported_user
@@ -17,72 +17,24 @@ class IssueTest < ActiveSupport::TestCase
     diary_entry = create(:diary_entry)
     diary_comment = create(:diary_comment, :diary_entry => diary_entry)
 
-    issue = Issue.new(:reportable => user)
+    issue = build(:issue, :reportable => user, :assigned_role => "administrator")
     issue.save!
     assert_equal issue.reported_user, user
 
-    issue = Issue.new(:reportable => note)
+    issue = build(:issue, :reportable => note, :assigned_role => "administrator")
     issue.save!
     assert_equal issue.reported_user, note.author
 
-    issue = Issue.new(:reportable => anonymous_note)
+    issue = build(:issue, :reportable => anonymous_note, :assigned_role => "administrator")
     issue.save!
     assert_nil issue.reported_user
 
-    issue = Issue.new(:reportable => diary_entry)
+    issue = build(:issue, :reportable => diary_entry, :assigned_role => "administrator")
     issue.save!
     assert_equal issue.reported_user, diary_entry.user
 
-    issue = Issue.new(:reportable => diary_comment)
+    issue = build(:issue, :reportable => diary_comment, :assigned_role => "administrator")
     issue.save!
     assert_equal issue.reported_user, diary_comment.user
   end
-
-  def test_default_assigned_role
-    create(:language, :code => "en")
-    user = create(:user)
-    note = create(:note_with_comments)
-    diary_entry = create(:diary_entry)
-    diary_comment = create(:diary_comment, :diary_entry => diary_entry)
-
-    issue = Issue.new(:reportable => user)
-    issue.save!
-    assert_equal "administrator", issue.assigned_role
-
-    issue = Issue.new(:reportable => note)
-    issue.save!
-    assert_equal "moderator", issue.assigned_role
-
-    issue = Issue.new(:reportable => diary_entry)
-    issue.save!
-    assert_equal "administrator", issue.assigned_role
-
-    issue = Issue.new(:reportable => diary_comment)
-    issue.save!
-    assert_equal "administrator", issue.assigned_role
-  end
-
-  def test_no_default_explicit_role
-    create(:language, :code => "en")
-    user = create(:user)
-    note = create(:note_with_comments)
-    diary_entry = create(:diary_entry)
-    diary_comment = create(:diary_comment, :diary_entry => diary_entry)
-
-    issue = Issue.new(:reportable => user, :assigned_role => "moderator")
-    issue.save!
-    assert_equal "moderator", issue.reload.assigned_role
-
-    issue = Issue.new(:reportable => note, :assigned_role => "administrator")
-    issue.save!
-    assert_equal "administrator", issue.reload.assigned_role
-
-    issue = Issue.new(:reportable => diary_entry, :assigned_role => "moderator")
-    issue.save!
-    assert_equal "moderator", issue.reload.assigned_role
-
-    issue = Issue.new(:reportable => diary_comment, :assigned_role => "moderator")
-    issue.save!
-    assert_equal "moderator", issue.reload.assigned_role
-  end
 end