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

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

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index b74cebcc4cc4d2da028f451eb97e0a5bf57ff0ce..34b16c19d5e113a197ee4ff8ba7b4b29ff600256 100644 (file)
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -8,13 +8,13 @@ class NoteTest < ActiveSupport::TestCase
     ok.each do |status|
       note = create(:note)
       note.status = status
     ok.each do |status|
       note = create(:note)
       note.status = status

-      assert note.valid?, "#{status} is invalid, when it should be"
+      assert_predicate note, :valid?, "#{status} is invalid, when it should be"

     end
 
     bad.each do |status|
       note = create(:note)
       note.status = status
     end
 
     bad.each do |status|
       note = create(:note)
       note.status = status

-      assert_not note.valid?, "#{status} is valid when it shouldn't be"
+      assert_not_predicate note, :valid?, "#{status} is valid when it shouldn't be"

     end
   end
 
     end
   end
 


@@ -28,7 +28,7 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_reopen
   end
 
   def test_reopen

-    note = create(:note, :status => "closed", :closed_at => Time.now.utc)
+    note = create(:note, :closed)

     assert_equal "closed", note.status
     assert_not_nil note.closed_at
     note.reopen
     assert_equal "closed", note.status
     assert_not_nil note.closed_at
     note.reopen


@@ -37,14 +37,14 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_visible?
   end
 
   def test_visible?

-    assert create(:note, :status => "open").visible?
-    assert create(:note, :status => "closed").visible?
-    assert_not create(:note, :status => "hidden").visible?
+    assert_predicate create(:note, :status => "open"), :visible?
+    assert_predicate create(:note, :closed), :visible?
+    assert_not_predicate create(:note, :status => "hidden"), :visible?

   end
 
   def test_closed?
   end
 
   def test_closed?

-    assert create(:note, :status => "closed", :closed_at => Time.now.utc).closed?
-    assert_not create(:note, :status => "open", :closed_at => nil).closed?
+    assert_predicate create(:note, :closed), :closed?
+    assert_not_predicate create(:note, :status => "open", :closed_at => nil), :closed?

   end
 
   def test_author
   end
 
   def test_author