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

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

diff --git a/test/models/relation_member_test.rb b/test/models/relation_member_test.rb
index a82cea457f104c211cb974bc0f83bec3ae3afdf4..7535c342ddbb4e2d586e12c01d29d5c6f1564e94 100644 (file)
--- a/test/models/relation_member_test.rb
+++ b/test/models/relation_member_test.rb
@@ -9,7 +9,7 @@ class RelationMemberTest < ActiveSupport::TestCase
     node = create(:node)
     invalid.each do |r|
       member = build(:relation_member, :relation => relation, :member => node, :member_role => r)
     node = create(:node)
     invalid.each do |r|
       member = build(:relation_member, :relation => relation, :member => node, :member_role => r)

-      assert_not member.valid?, "'#{r}' should not be valid"
+      assert_not_predicate member, :valid?, "'#{r}' should not be valid"

       assert_predicate member.errors[:member_role], :any?
     end
   end
       assert_predicate member.errors[:member_role], :any?
     end
   end


@@ -18,7 +18,7 @@ class RelationMemberTest < ActiveSupport::TestCase
     relation = create(:relation)
     node = create(:node)
     member = build(:relation_member, :relation => relation, :member => node, :member_role => "r" * 256)
     relation = create(:relation)
     node = create(:node)
     member = build(:relation_member, :relation => relation, :member => node, :member_role => "r" * 256)

-    assert_not member.valid?, "Role should be too long"
+    assert_not_predicate member, :valid?, "Role should be too long"

     assert_predicate member.errors[:member_role], :any?
   end
 end
     assert_predicate member.errors[:member_role], :any?
   end
 end