Merged r12070 from trunk to 2.3-stable

not use assert_not_nil in Errors#[].

r7593 etc. replaced Rails2 Errors#on.
Rails3 Errors#[] always return array.
So, Rails3 Errors#[] is always not nil.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12071 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2013-07-30 09:38:00 +00:00
parent dc98cec17f
commit d155392b3c
6 changed files with 13 additions and 13 deletions

View File

@ -209,7 +209,7 @@ class ProjectsControllerTest < ActionController::TestCase
assert_response :success
project = assigns(:project)
assert_kind_of Project, project
assert_not_nil project.errors[:parent_id]
assert_not_equal [], project.errors[:parent_id]
end
test "#create by non-admin user with add_subprojects permission should create a project with a parent_id" do
@ -244,7 +244,7 @@ class ProjectsControllerTest < ActionController::TestCase
assert_response :success
project = assigns(:project)
assert_kind_of Project, project
assert_not_nil project.errors[:parent_id]
assert_not_equal [], project.errors[:parent_id]
end
test "#create by non-admin user with add_subprojects permission should fail with unauthorized parent_id" do
@ -265,7 +265,7 @@ class ProjectsControllerTest < ActionController::TestCase
assert_response :success
project = assigns(:project)
assert_kind_of Project, project
assert_not_nil project.errors[:parent_id]
assert_not_equal [], project.errors[:parent_id]
end
def test_create_subproject_with_inherit_members_should_inherit_members

View File

@ -93,7 +93,7 @@ class AttachmentTest < ActiveSupport::TestCase
def test_description_length_should_be_validated
a = Attachment.new(:description => 'a' * 300)
assert !a.save
assert_not_nil a.errors[:description]
assert_not_equal [], a.errors[:description]
end
def test_destroy

View File

@ -57,7 +57,7 @@ class IssueNestedSetTest < ActiveSupport::TestCase
child = Issue.new(:project_id => 2, :tracker_id => 1, :author_id => 1,
:subject => 'child', :parent_issue_id => issue.id)
assert !child.save
assert_not_nil child.errors[:parent_issue_id]
assert_not_equal [], child.errors[:parent_issue_id]
end
def test_move_a_root_to_child
@ -163,7 +163,7 @@ class IssueNestedSetTest < ActiveSupport::TestCase
child.reload
child.parent_issue_id = grandchild.id
assert !child.save
assert_not_nil child.errors[:parent_issue_id]
assert_not_equal [], child.errors[:parent_issue_id]
end
def test_destroy_should_destroy_children

View File

@ -114,7 +114,7 @@ class IssueRelationTest < ActiveSupport::TestCase
:relation_type => IssueRelation::TYPE_PRECEDES
)
assert !r.save
assert_not_nil r.errors[:base]
assert_not_equal [], r.errors[:base]
end
def test_validates_circular_dependency_of_subtask
@ -165,6 +165,6 @@ class IssueRelationTest < ActiveSupport::TestCase
:relation_type => IssueRelation::TYPE_BLOCKED
)
assert !r.save
assert_not_nil r.errors[:base]
assert_not_equal [], r.errors[:base]
end
end

View File

@ -469,7 +469,7 @@ class IssueTest < ActiveSupport::TestCase
issue.tracker_id = 2
issue.subject = 'New subject'
assert !issue.save
assert_not_nil issue.errors[:tracker_id]
assert_not_equal [], issue.errors[:tracker_id]
end
def test_category_based_assignment
@ -1024,7 +1024,7 @@ class IssueTest < ActiveSupport::TestCase
:status_id => 1, :fixed_version_id => 1,
:subject => 'New issue')
assert !issue.save
assert_not_nil issue.errors[:fixed_version_id]
assert_not_equal [], issue.errors[:fixed_version_id]
end
def test_should_not_be_able_to_assign_a_new_issue_to_a_locked_version
@ -1032,7 +1032,7 @@ class IssueTest < ActiveSupport::TestCase
:status_id => 1, :fixed_version_id => 2,
:subject => 'New issue')
assert !issue.save
assert_not_nil issue.errors[:fixed_version_id]
assert_not_equal [], issue.errors[:fixed_version_id]
end
def test_should_be_able_to_assign_a_new_issue_to_an_open_version
@ -1053,7 +1053,7 @@ class IssueTest < ActiveSupport::TestCase
issue = Issue.find(11)
issue.status_id = 1
assert !issue.save
assert_not_nil issue.errors[:base]
assert_not_equal [], issue.errors[:base]
end
def test_should_be_able_to_reopen_and_reassign_an_issue_assigned_to_a_closed_version

View File

@ -366,7 +366,7 @@ class UserTest < ActiveSupport::TestCase
u = User.new
u.mail_notification = 'foo'
u.save
assert_not_nil u.errors[:mail_notification]
assert_not_equal [], u.errors[:mail_notification]
end
context "User#try_to_login" do