summaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-07-30 08:23:54 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-07-30 08:23:54 +0000
commitc49451eb102d62fcc0982721ccad14087883f9ce (patch)
tree0d6aa6c7a78b6236b7f84c28fd3bd84d5a9f2fbe /test/unit
parentc20b1d64a72fd50c8d8de9d32d811b803ca1e6bb (diff)
downloadredmine-c49451eb102d62fcc0982721ccad14087883f9ce.tar.gz
redmine-c49451eb102d62fcc0982721ccad14087883f9ce.zip
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/trunk@12070 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/attachment_test.rb2
-rw-r--r--test/unit/issue_nested_set_test.rb4
-rw-r--r--test/unit/issue_relation_test.rb4
-rw-r--r--test/unit/issue_test.rb8
-rw-r--r--test/unit/user_test.rb2
5 files changed, 10 insertions, 10 deletions
diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
index e32754b7d..b3608aef7 100644
--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -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
diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index c3120e82a..0d83671e0 100644
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_test.rb
@@ -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
diff --git a/test/unit/issue_relation_test.rb b/test/unit/issue_relation_test.rb
index 3bcf06bd5..6fc408353 100644
--- a/test/unit/issue_relation_test.rb
+++ b/test/unit/issue_relation_test.rb
@@ -115,7 +115,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
@@ -166,7 +166,7 @@ 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
def test_create_should_make_journal_entry
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index ef1a3fb03..8f9f965cb 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -490,7 +490,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
@@ -1045,7 +1045,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
@@ -1053,7 +1053,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
@@ -1074,7 +1074,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
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 52a7d64b7..f1da321aa 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -401,7 +401,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
def test_password