Commit 6ebe7a2a6335731d0c6cfc545e6e9b579e229856
1 parent
9fbb1367
Exists in
staging
and in
42 other branches
assert_valid was removed in Rails 2.3.5
Showing
2 changed files
with
5 additions
and
4 deletions
Show diff stats
test/unit/environment_test.rb
| ... | ... | @@ -794,7 +794,7 @@ class EnvironmentTest < ActiveSupport::TestCase |
| 794 | 794 | e2 = fast_create(Environment) |
| 795 | 795 | role2 = Role.new(:name => 'test_role', :environment => e2) |
| 796 | 796 | |
| 797 | - assert_valid role2 | |
| 797 | + assert role2.valid? | |
| 798 | 798 | end |
| 799 | 799 | |
| 800 | 800 | should 'have roles with keys independent of other environments' do |
| ... | ... | @@ -803,7 +803,7 @@ class EnvironmentTest < ActiveSupport::TestCase |
| 803 | 803 | e2 = fast_create(Environment) |
| 804 | 804 | role2 = Role.new(:name => 'test_role', :environment => e2, :key => 'a_member') |
| 805 | 805 | |
| 806 | - assert_valid role2 | |
| 806 | + assert role2.valid? | |
| 807 | 807 | end |
| 808 | 808 | |
| 809 | 809 | should 'have a help_message_to_add_enterprise attribute' do | ... | ... |
test/unit/person_test.rb
| ... | ... | @@ -587,8 +587,9 @@ class PersonTest < ActiveSupport::TestCase |
| 587 | 587 | end |
| 588 | 588 | end |
| 589 | 589 | |
| 590 | - should 'not rename' do | |
| 591 | - assert_valid p = create_user('test_user').person | |
| 590 | + should 'not be renamed' do | |
| 591 | + p = create_user('test_user').person | |
| 592 | + assert p.valid? | |
| 592 | 593 | assert_raise ArgumentError do |
| 593 | 594 | p.identifier = 'other_person_name' |
| 594 | 595 | end | ... | ... |