diff --git a/test/test_helper.rb b/test/test_helper.rb
index 383f83e..7d28977 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -95,16 +95,16 @@ class ActiveSupport::TestCase
def assert_mandatory(object, attribute, test_value = 'some random string')
object.send("#{attribute}=", nil)
object.valid?
- assert object.errors.invalid?(attribute), "Attribute \"#{attribute.to_s}\" expected to be mandatory."
+ assert object.errors[attribute.to_s].present?, "Attribute \"#{attribute.to_s}\" expected to be mandatory."
object.send("#{attribute}=", test_value)
object.valid?
- assert !object.errors.invalid?(attribute), "Attribute \"#{attribute.to_s}\" expected to accept value #{test_value.inspect}"
+ assert !object.errors[attribute.to_s].present?, "Attribute \"#{attribute.to_s}\" expected to accept value #{test_value.inspect}"
end
def assert_optional(object, attribute)
object.send("#{attribute}=", nil)
object.valid?
- assert !object.errors.invalid?(attribute)
+ assert !object.errors[attribute.to_s].present?
end
def assert_subclass(parent, child)
diff --git a/test/unit/action_tracker_notification_test.rb b/test/unit/action_tracker_notification_test.rb
index 8ff6c6e..4585ebd 100644
--- a/test/unit/action_tracker_notification_test.rb
+++ b/test/unit/action_tracker_notification_test.rb
@@ -5,21 +5,21 @@ class ActionTrackerNotificationTest < ActiveSupport::TestCase
should "have the profile" do
a = ActionTrackerNotification.new
a.valid?
- assert a.errors.invalid?(:profile_id)
+ assert a.errors[:profile_id.to_s].present?
a.profile_id= 1
a.valid?
- assert !a.errors.invalid?(:profile_id)
+ assert !a.errors[:profile_id.to_s].present?
end
should "have the action tracker" do
a = ActionTrackerNotification.new
a.valid?
- assert a.errors.invalid?(:action_tracker_id)
+ assert a.errors[:action_tracker_id.to_s].present?
a.action_tracker_id= 1
a.valid?
- assert !a.errors.invalid?(:action_tracker_id)
+ assert !a.errors[:action_tracker_id.to_s].present?
end
should "be associated to Person" do
@@ -54,11 +54,11 @@ class ActionTrackerNotificationTest < ActiveSupport::TestCase
atn = ActionTrackerNotification.new(:action_tracker_id => 1, :profile_id => 1)
atn.valid?
- assert atn.errors.invalid?(:action_tracker_id)
+ assert atn.errors[:action_tracker_id.to_s].present?
atn.profile_id = 2
atn.valid?
- assert !atn.errors.invalid?(:action_tracker_id)
+ assert !atn.errors[:action_tracker_id.to_s].present?
end
should "the action_tracker_id be unique on scope of profile when created by ActionTracker::Record association" do
diff --git a/test/unit/add_friend_test.rb b/test/unit/add_friend_test.rb
index 435bba7..7989a06 100644
--- a/test/unit/add_friend_test.rb
+++ b/test/unit/add_friend_test.rb
@@ -44,11 +44,11 @@ class AddFriendTest < ActiveSupport::TestCase
task = AddFriend.new
task.valid?
- ok('must not validate with empty requestor') { task.errors.invalid?(:requestor_id) }
+ ok('must not validate with empty requestor') { task.errors[:requestor_id.to_s].present? }
task.requestor = Person.new
task.valid?
- ok('must validate when requestor is given') { task.errors.invalid?(:requestor_id)}
+ ok('must validate when requestor is given') { task.errors[:requestor_id.to_s].present?}
end
@@ -56,11 +56,11 @@ class AddFriendTest < ActiveSupport::TestCase
task = AddFriend.new
task.valid?
- ok('must not validate with empty target') { task.errors.invalid?(:target_id) }
+ ok('must not validate with empty target') { task.errors[:target_id.to_s].present? }
task.target = Person.new
task.valid?
- ok('must validate when target is given') { task.errors.invalid?(:target_id)}
+ ok('must validate when target is given') { task.errors[:target_id.to_s].present?}
end
should 'send e-mails' do
diff --git a/test/unit/add_member_test.rb b/test/unit/add_member_test.rb
index b8aff54..a89475b 100644
--- a/test/unit/add_member_test.rb
+++ b/test/unit/add_member_test.rb
@@ -34,22 +34,22 @@ class AddMemberTest < ActiveSupport::TestCase
task = AddMember.new
task.valid?
- ok('must not validate with empty requestor') { task.errors.invalid?(:requestor_id) }
+ ok('must not validate with empty requestor') { task.errors[:requestor_id.to_s].present? }
task.requestor = Person.new
task.valid?
- ok('must validate when requestor is given') { task.errors.invalid?(:requestor_id)}
+ ok('must validate when requestor is given') { task.errors[:requestor_id.to_s].present?}
end
should 'require target' do
task = AddMember.new
task.valid?
- ok('must not validate with empty target') { task.errors.invalid?(:target_id) }
+ ok('must not validate with empty target') { task.errors[:target_id.to_s].present? }
task.target = Person.new
task.valid?
- ok('must validate when target is given') { task.errors.invalid?(:target_id)}
+ ok('must validate when target is given') { task.errors[:target_id.to_s].present?}
end
should 'send e-mails' do
diff --git a/test/unit/approve_comment_test.rb b/test/unit/approve_comment_test.rb
index c49237e..d613c20 100644
--- a/test/unit/approve_comment_test.rb
+++ b/test/unit/approve_comment_test.rb
@@ -91,11 +91,11 @@ class ApproveCommentTest < ActiveSupport::TestCase
task = ApproveComment.new
task.valid?
- ok('must not validate with empty target') { task.errors.invalid?(:target_id) }
+ ok('must not validate with empty target') { task.errors[:target_id.to_s].present? }
task.target = Person.new
task.valid?
- ok('must validate when target is given') { task.errors.invalid?(:target_id)}
+ ok('must validate when target is given') { task.errors[:target_id.to_s].present?}
end
should 'send e-mails' do
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 9e7cbb7..fe2587c 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -13,31 +13,31 @@ class ArticleTest < ActiveSupport::TestCase
should 'have and require an associated profile' do
a = Article.new
a.valid?
- assert a.errors.invalid?(:profile_id)
+ assert a.errors[:profile_id.to_s].present?
a.profile = profile
a.valid?
- assert !a.errors.invalid?(:profile_id)
+ assert !a.errors[:profile_id.to_s].present?
end
should 'require value for name' do
a = Article.new
a.valid?
- assert a.errors.invalid?(:name)
+ assert a.errors[:name.to_s].present?
a.name = 'my article'
a.valid?
- assert !a.errors.invalid?(:name)
+ assert !a.errors[:name.to_s].present?
end
should 'limit length of names' do
a = Article.new(:name => 'a'*151)
a.valid?
- assert a.errors.invalid?(:name)
+ assert a.errors[:name.to_s].present?
a.name = 'a'*150
a.valid?
- assert !a.errors.invalid?(:name)
+ assert !a.errors[:name.to_s].present?
end
should 'require value for slug and path if name is filled' do
@@ -45,15 +45,15 @@ class ArticleTest < ActiveSupport::TestCase
a.slug = nil
a.path = nil
a.valid?
- assert a.errors.invalid?(:slug)
- assert a.errors.invalid?(:path)
+ assert a.errors[:slug.to_s].present?
+ assert a.errors[:path.to_s].present?
end
should 'not require value for slug and path if name is blank' do
a = Article.new
a.valid?
- assert !a.errors.invalid?(:slug)
- assert !a.errors.invalid?(:path)
+ assert !a.errors[:slug.to_s].present?
+ assert !a.errors[:path.to_s].present?
end
should 'act as versioned' do
@@ -136,20 +136,20 @@ class ArticleTest < ActiveSupport::TestCase
# cannot add another top level article with same slug
a2 = profile.articles.build(:name => 'test')
a2.valid?
- assert a2.errors.invalid?(:slug)
+ assert a2.errors[:slug.to_s].present?
# now create a child of a1
a3 = profile.articles.build(:name => 'test')
a3.parent = a1
a3.valid?
- assert !a3.errors.invalid?(:slug)
+ assert !a3.errors[:slug.to_s].present?
a3.save!
# cannot add another child of a1 with same slug
a4 = profile.articles.build(:name => 'test')
a4.parent = a1
a4.valid?
- assert a4.errors.invalid?(:slug)
+ assert a4.errors[:slug.to_s].present?
end
should 'record who did the last change' do
@@ -1218,19 +1218,19 @@ class ArticleTest < ActiveSupport::TestCase
a = build(Article, :profile_id => fast_create(Profile).id)
a.language = '12'
a.valid?
- assert a.errors.invalid?(:language)
+ assert a.errors[:language.to_s].present?
a.language = 'en'
a.valid?
- assert !a.errors.invalid?(:language)
+ assert !a.errors[:language.to_s].present?
end
should 'language can be blank' do
a = build(Article)
a.valid?
- assert !a.errors.invalid?(:language)
+ assert !a.errors[:language.to_s].present?
a.language = ''
a.valid?
- assert !a.errors.invalid?(:language)
+ assert !a.errors[:language.to_s].present?
end
should 'article is not translatable' do
@@ -1261,10 +1261,10 @@ class ArticleTest < ActiveSupport::TestCase
a.language = 'en'
a.translation_of = native_article
a.valid?
- assert a.errors.invalid?(:language)
+ assert a.errors[:language.to_s].present?
a.language = 'es'
a.valid?
- assert !a.errors.invalid?(:language)
+ assert !a.errors[:language.to_s].present?
end
should 'verify if native translation is already in use' do
@@ -1273,10 +1273,10 @@ class ArticleTest < ActiveSupport::TestCase
a.language = 'pt'
a.translation_of = native_article
a.valid?
- assert a.errors.invalid?(:language)
+ assert a.errors[:language.to_s].present?
a.language = 'es'
a.valid?
- assert !a.errors.invalid?(:language)
+ assert !a.errors[:language.to_s].present?
end
should 'translation have a language' do
@@ -1284,10 +1284,10 @@ class ArticleTest < ActiveSupport::TestCase
a = build(Article, :profile_id => fast_create(Profile).id)
a.translation_of = native_article
a.valid?
- assert a.errors.invalid?(:language)
+ assert a.errors[:language.to_s].present?
a.language = 'en'
a.valid?
- assert !a.errors.invalid?(:language)
+ assert !a.errors[:language.to_s].present?
end
should 'native translation have a language' do
@@ -1714,7 +1714,7 @@ class ArticleTest < ActiveSupport::TestCase
article.parent = article
article.valid?
- assert article.errors.invalid?(:parent_id)
+ assert article.errors[:parent_id.to_s].present?
end
should 'not allow cyclical paternity' do
@@ -1724,7 +1724,7 @@ class ArticleTest < ActiveSupport::TestCase
a1.parent = a3
a1.valid?
- assert a1.errors.invalid?(:parent_id)
+ assert a1.errors[:parent_id.to_s].present?
end
should 'set author_name before creating article if there is an author' do
diff --git a/test/unit/blog_test.rb b/test/unit/blog_test.rb
index 70b2a36..2155dd3 100644
--- a/test/unit/blog_test.rb
+++ b/test/unit/blog_test.rb
@@ -164,15 +164,15 @@ class BlogTest < ActiveSupport::TestCase
blog = Blog.new(:name => 'blog')
blog.visualization_format = 'wrong_format'
blog.valid?
- assert blog.errors.invalid?(:visualization_format)
+ assert blog.errors[:visualization_format.to_s].present?
blog.visualization_format = 'short'
blog.valid?
- assert !blog.errors.invalid?(:visualization_format)
+ assert !blog.errors[:visualization_format.to_s].present?
blog.visualization_format = 'full'
blog.valid?
- assert !blog.errors.invalid?(:visualization_format)
+ assert !blog.errors[:visualization_format.to_s].present?
end
should 'have posts' do
diff --git a/test/unit/category_test.rb b/test/unit/category_test.rb
index 5eb2c0b..739ed90 100644
--- a/test/unit/category_test.rb
+++ b/test/unit/category_test.rb
@@ -11,14 +11,14 @@ class CategoryTest < ActiveSupport::TestCase
c = Category.new
c.organization = @env
c.save
- assert c.errors.invalid?(:name)
+ assert c.errors[:name.to_s].present?
end
def test_mandatory_field_name
c = Category.new
c.name = 'product category for testing'
assert !c.valid?
- assert c.errors.invalid?(:environment_id)
+ assert c.errors[:environment_id.to_s].present?
end
def test_relationship_with_environment
@@ -136,7 +136,7 @@ class CategoryTest < ActiveSupport::TestCase
c2 = Category.new(:name => 'Test: Category', :environment_id => @env.id)
assert !c2.valid?
- assert c2.errors.invalid?(:slug)
+ assert c2.errors[:slug.to_s].present?
end
should 'be able to duplicated slug in different scope' do
@@ -170,13 +170,13 @@ class CategoryTest < ActiveSupport::TestCase
c.display_color = 10
c.valid?
- assert c.errors.invalid?(:display_color)
+ assert c.errors[:display_color.to_s].present?
valid = %w[ 1 2 3 4 ].map { |item| item.to_i }
valid.each do |item|
c.display_color = item
c.valid?
- assert !c.errors.invalid?(:display_color)
+ assert !c.errors[:display_color.to_s].present?
end
end
@@ -187,11 +187,11 @@ class CategoryTest < ActiveSupport::TestCase
c = Category.new(:name => 'lalala', :environment_id => @env.id)
c.display_color = 1
assert !c.valid?
- assert c.errors.invalid?(:display_color)
+ assert c.errors[:display_color.to_s].present?
c.display_color = 2
c.valid?
- assert !c.errors.invalid?(:display_color)
+ assert !c.errors[:display_color.to_s].present?
end
diff --git a/test/unit/change_password_test.rb b/test/unit/change_password_test.rb
index cb6b9cd..2fe8740 100644
--- a/test/unit/change_password_test.rb
+++ b/test/unit/change_password_test.rb
@@ -17,7 +17,7 @@ class ChangePasswordTest < ActiveSupport::TestCase
data.email = 'example@example.com'
data.environment_id = Environment.default.id
data.valid?
- assert data.errors.invalid?(:login)
+ assert data.errors[:login.to_s].present?
end
should 'require a valid username' do
@@ -27,7 +27,7 @@ class ChangePasswordTest < ActiveSupport::TestCase
data = ChangePassword.new
data.login = 'testuser'
data.valid?
- assert !data.errors.invalid?(:login)
+ assert !data.errors[:login.to_s].present?
end
should 'refuse incorrect e-mail address' do
@@ -40,8 +40,8 @@ class ChangePasswordTest < ActiveSupport::TestCase
data.environment_id = Environment.default.id
data.valid?
- assert !data.errors.invalid?(:login)
- assert data.errors.invalid?(:email)
+ assert !data.errors[:login.to_s].present?
+ assert data.errors[:email.to_s].present?
end
should 'require the correct e-mail address' do
@@ -54,8 +54,8 @@ class ChangePasswordTest < ActiveSupport::TestCase
data.environment_id = Environment.default.id
data.valid?
- assert !data.errors.invalid?(:login)
- assert !data.errors.invalid?(:email)
+ assert !data.errors[:login.to_s].present?
+ assert !data.errors[:email.to_s].present?
end
should 'require correct passsword confirmation' do
@@ -71,7 +71,7 @@ class ChangePasswordTest < ActiveSupport::TestCase
change.password = 'right'
change.password_confirmation = 'wrong'
assert !change.valid?
- assert change.errors.invalid?(:password)
+ assert change.errors[:password.to_s].present?
change.password_confirmation = 'right'
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index fdd48f0..af4cde3 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -59,7 +59,7 @@ class CommentTest < ActiveSupport::TestCase
c1.author = create_user('someperson').person
c1.name = 'my name'
c1.valid?
- assert c1.errors.invalid?(:name)
+ assert c1.errors[:name.to_s].present?
assert_no_match /\{fn\}/, c1.errors.on(:name)
end
@@ -172,7 +172,7 @@ class CommentTest < ActiveSupport::TestCase
should 'not accept invalid email' do
c = Comment.new(:name => 'My Name', :email => 'my@invalid')
c.valid?
- assert c.errors.invalid?(:email)
+ assert c.errors[:email.to_s].present?
end
should 'generate links to comments on images with view set to true' do
@@ -197,8 +197,8 @@ class CommentTest < ActiveSupport::TestCase
comment = article.comments.new(:title => '
', :body => '', :name => '', :email => 'cracker@test.org')
comment.valid?
- assert comment.errors.invalid?(:name)
- assert comment.errors.invalid?(:body)
+ assert comment.errors[:name.to_s].present?
+ assert comment.errors[:body.to_s].present?
end
should 'escape malformed html tags' do
diff --git a/test/unit/community_test.rb b/test/unit/community_test.rb
index e193c49..46f4ae4 100644
--- a/test/unit/community_test.rb
+++ b/test/unit/community_test.rb
@@ -117,11 +117,11 @@ class CommunityTest < ActiveSupport::TestCase
e.expects(:required_community_fields).returns(['contact_phone']).at_least_once
community = Community.new(:name => 'My community', :environment => e)
assert ! community.valid?
- assert community.errors.invalid?(:contact_phone)
+ assert community.errors[:contact_phone.to_s].present?
community.contact_phone = '99999'
community.valid?
- assert ! community.errors.invalid?(:contact_phone)
+ assert ! community.errors[:contact_phone.to_s].present?
end
should 'return newest text articles as news' do
diff --git a/test/unit/create_community_test.rb b/test/unit/create_community_test.rb
index bff28ea..ba63a1f 100644
--- a/test/unit/create_community_test.rb
+++ b/test/unit/create_community_test.rb
@@ -20,10 +20,10 @@ class CreateCommunityTest < ActiveSupport::TestCase
task = CreateCommunity.new(:name => 'community test', :target => Environment.default)
task.valid?
- assert task.errors.invalid?(:requestor_id)
+ assert task.errors[:requestor_id.to_s].present?
task.requestor = person
task.valid?
- assert !task.errors.invalid?(:requestor_id)
+ assert !task.errors[:requestor_id.to_s].present?
end
should 'actually create a community when finishing the task and associate the task requestor as its admin' do
diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb
index 9b59b44..fc00b5a 100644
--- a/test/unit/create_enterprise_test.rb
+++ b/test/unit/create_enterprise_test.rb
@@ -22,11 +22,11 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
task.foundation_year = "test"
task.valid?
- assert task.errors.invalid?(:foundation_year)
+ assert task.errors[:foundation_year.to_s].present?
task.foundation_year = 2006
task.valid?
- assert !task.errors.invalid?(:foundation_year)
+ assert !task.errors[:foundation_year.to_s].present?
end
should 'require a requestor' do
@@ -34,10 +34,10 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
task.stubs(:environment).returns(Environment.default)
task.valid?
- assert task.errors.invalid?(:requestor_id)
+ assert task.errors[:requestor_id.to_s].present?
task.requestor = create_user('testuser').person
task.valid?
- assert !task.errors.invalid?(:requestor_id)
+ assert !task.errors[:requestor_id.to_s].present?
end
should 'require a target (validator organization)' do
@@ -45,11 +45,11 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
task.stubs(:environment).returns(Environment.default)
task.valid?
- assert task.errors.invalid?(:target_id)
+ assert task.errors[:target_id.to_s].present?
task.target = Organization.create!(:name => "My organization", :identifier => 'validator_organization')
task.valid?
- assert !task.errors.invalid?(:target_id)
+ assert !task.errors[:target_id.to_s].present?
end
should 'require that the informed target (validator organization) actually validates for the chosen region' do
@@ -64,12 +64,12 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
task.target = validator
task.valid?
- assert task.errors.invalid?(:target)
+ assert task.errors[:target.to_s].present?
region.validators << validator
task.valid?
- assert !task.errors.invalid?(:target)
+ assert !task.errors[:target.to_s].present?
end
should 'cancel task when rejected ' do
@@ -84,15 +84,15 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
task.reject_explanation = nil
task.valid?
- assert !task.errors.invalid?(:reject_explanation)
+ assert !task.errors[:reject_explanation.to_s].present?
task.status = Task::Status::CANCELLED
task.valid?
- assert task.errors.invalid?(:reject_explanation)
+ assert task.errors[:reject_explanation.to_s].present?
task.reject_explanation = 'bla bla bla'
task.valid?
- assert !task.errors.invalid?(:reject_explanation)
+ assert !task.errors[:reject_explanation.to_s].present?
end
should 'finish task when approved' do
@@ -232,11 +232,11 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
request.stubs(:environment).returns(Environment.default)
request.identifier = 'testid'
request.valid?
- assert !request.errors.invalid?(:identifier)
+ assert !request.errors[:identifier.to_s].present?
Organization.create!(:name => 'test', :identifier => 'testid')
request.valid?
- assert request.errors.invalid?(:identifier)
+ assert request.errors[:identifier.to_s].present?
end
should 'require the same fields as an enterprise does' do
diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb
index 36a9414..20f6dea 100644
--- a/test/unit/domain_test.rb
+++ b/test/unit/domain_test.rb
@@ -10,37 +10,37 @@ class DomainTest < ActiveSupport::TestCase
should 'not allow domains without name' do
domain = Domain.new
domain.valid?
- assert domain.errors.invalid?(:name)
+ assert domain.errors[:name.to_s].present?
end
should 'not allow domain without dot' do
domain = Domain.new(:name => 'test')
domain.valid?
- assert domain.errors.invalid?(:name)
+ assert domain.errors[:name.to_s].present?
end
should 'allow domains with dot' do
domain = Domain.new(:name => 'test.org')
domain.valid?
- assert !domain.errors.invalid?(:name)
+ assert !domain.errors[:name.to_s].present?
end
should 'not allow domains with upper cased letters' do
domain = Domain.new(:name => 'tEst.org')
domain.valid?
- assert domain.errors.invalid?(:name)
+ assert domain.errors[:name.to_s].present?
end
should 'allow domains with hyphen' do
domain = Domain.new(:name => 'test-domain.org')
domain.valid?
- assert !domain.errors.invalid?(:name)
+ assert !domain.errors[:name.to_s].present?
end
should 'allow domains with underscore' do
domain = Domain.new(:name => 'test_domain.org')
domain.valid?
- assert !domain.errors.invalid?(:name)
+ assert !domain.errors[:name.to_s].present?
end
def test_owner
@@ -59,11 +59,11 @@ class DomainTest < ActiveSupport::TestCase
d = Domain.new
d.name = 'www.example.net'
d.valid?
- assert d.errors.invalid?(:name)
+ assert d.errors[:name.to_s].present?
d.name = 'example.net'
d.valid?
- assert !d.errors.invalid?(:name)
+ assert !d.errors[:name.to_s].present?
end
def test_find_by_name
@@ -82,7 +82,7 @@ class DomainTest < ActiveSupport::TestCase
d = Domain.new(:name => 'example.net')
assert !d.valid?
- assert d.errors.invalid?(:name)
+ assert d.errors[:name.to_s].present?
end
def test_environment
diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb
index 268ca38..cb94901 100644
--- a/test/unit/enterprise_test.rb
+++ b/test/unit/enterprise_test.rb
@@ -12,27 +12,27 @@ class EnterpriseTest < ActiveSupport::TestCase
def test_identifier_validation
p = Enterprise.new
p.valid?
- assert p.errors.invalid?(:identifier)
+ assert p.errors[:identifier.to_s].present?
p.identifier = 'with space'
p.valid?
- assert p.errors.invalid?(:identifier)
+ assert p.errors[:identifier.to_s].present?
p.identifier = 'áéíóú'
p.valid?
- assert p.errors.invalid?(:identifier)
+ assert p.errors[:identifier.to_s].present?
p.identifier = 'rightformat2007'
p.valid?
- assert ! p.errors.invalid?(:identifier)
+ assert ! p.errors[:identifier.to_s].present?
p.identifier = 'rightformat'
p.valid?
- assert ! p.errors.invalid?(:identifier)
+ assert ! p.errors[:identifier.to_s].present?
p.identifier = 'right_format'
p.valid?
- assert ! p.errors.invalid?(:identifier)
+ assert ! p.errors[:identifier.to_s].present?
end
def test_has_domains
@@ -300,11 +300,11 @@ class EnterpriseTest < ActiveSupport::TestCase
e.expects(:required_enterprise_fields).returns(['contact_phone']).at_least_once
enterprise = Enterprise.new(:environment => e)
assert ! enterprise.valid?
- assert enterprise.errors.invalid?(:contact_phone)
+ assert enterprise.errors[:contact_phone.to_s].present?
enterprise.contact_phone = '99999'
enterprise.valid?
- assert ! enterprise.errors.invalid?(:contact_phone)
+ assert ! enterprise.errors[:contact_phone.to_s].present?
end
should 'enable contact' do
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 1c510f4..4f9f5f7 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -12,7 +12,7 @@ class EnvironmentTest < ActiveSupport::TestCase
vc2 = Environment.new(:name => 'Another Test Community')
vc2.is_default = true
assert !vc2.valid?
- assert vc2.errors.invalid?(:is_default)
+ assert vc2.errors[:is_default.to_s].present?
assert_equal vc, Environment.default
end
@@ -56,10 +56,10 @@ class EnvironmentTest < ActiveSupport::TestCase
def test_name_is_mandatory
v = Environment.new
v.valid?
- assert v.errors.invalid?(:name)
+ assert v.errors[:name.to_s].present?
v.name = 'blablabla'
v.valid?
- assert !v.errors.invalid?(:name)
+ assert !v.errors[:name.to_s].present?
end
def test_terms_of_use
@@ -181,11 +181,11 @@ class EnvironmentTest < ActiveSupport::TestCase
env.contact_email = 'test'
env.valid?
- assert env.errors.invalid?(:contact_email)
+ assert env.errors[:contact_email.to_s].present?
env.contact_email = 'test@example.com'
env.valid?
- assert !env.errors.invalid?(:contact_email)
+ assert !env.errors[:contact_email.to_s].present?
end
should 'provide a default hostname' do
@@ -1155,19 +1155,19 @@ class EnvironmentTest < ActiveSupport::TestCase
environment.reports_lower_bound = nil
environment.valid?
- assert environment.errors.invalid?(:reports_lower_bound)
+ assert environment.errors[:reports_lower_bound.to_s].present?
environment.reports_lower_bound = -3
environment.valid?
- assert environment.errors.invalid?(:reports_lower_bound)
+ assert environment.errors[:reports_lower_bound.to_s].present?
environment.reports_lower_bound = 1.5
environment.valid?
- assert environment.errors.invalid?(:reports_lower_bound)
+ assert environment.errors[:reports_lower_bound.to_s].present?
environment.reports_lower_bound = 5
environment.valid?
- assert !environment.errors.invalid?(:reports_lower_bound)
+ assert !environment.errors[:reports_lower_bound.to_s].present?
end
should 'be able to enable or disable a plugin with the class or class name' do
@@ -1214,12 +1214,12 @@ class EnvironmentTest < ActiveSupport::TestCase
environment = fast_create(Environment)
environment.redirection_after_login = 'invalid_option'
environment.save
- assert environment.errors.invalid?(:redirection_after_login)
+ assert environment.errors[:redirection_after_login.to_s].present?
Environment.login_redirection_options.keys.each do |redirection|
environment.redirection_after_login = redirection
environment.save
- assert !environment.errors.invalid?(:redirection_after_login)
+ assert !environment.errors[:redirection_after_login.to_s].present?
end
end
@@ -1306,11 +1306,11 @@ class EnvironmentTest < ActiveSupport::TestCase
environment.stubs(:available_locales).returns(['en'])
environment.default_language = 'pt'
environment.valid?
- assert environment.errors.invalid?(:default_language)
+ assert environment.errors[:default_language.to_s].present?
environment.default_language = 'en'
environment.valid?
- assert !environment.errors.invalid?(:default_language)
+ assert !environment.errors[:default_language.to_s].present?
end
should 'define default locale or use the config default locale' do
@@ -1329,11 +1329,11 @@ class EnvironmentTest < ActiveSupport::TestCase
environment.languages = ['zz']
environment.valid?
- assert environment.errors.invalid?(:languages)
+ assert environment.errors[:languages.to_s].present?
environment.languages = ['en']
environment.valid?
- assert !environment.errors.invalid?(:languages)
+ assert !environment.errors[:languages.to_s].present?
end
should 'define locales or use the config locales' do
diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb
index 95aab5e..29cccd4 100644
--- a/test/unit/event_test.rb
+++ b/test/unit/event_test.rb
@@ -44,10 +44,10 @@ class EventTest < ActiveSupport::TestCase
e = Event.new
e.start_date = nil
e.valid?
- assert e.errors.invalid?(:start_date)
+ assert e.errors[:start_date.to_s].present?
e.start_date = Date.today
e.valid?
- assert !e.errors.invalid?(:start_date)
+ assert !e.errors[:start_date.to_s].present?
end
should 'have a end date' do
@@ -63,11 +63,11 @@ class EventTest < ActiveSupport::TestCase
should 'not allow end date before start date' do
e = Event.new(:start_date => Date.new(2008, 01, 01), :end_date => Date.new(2007,01,01))
e.valid?
- assert e.errors.invalid?(:start_date)
+ assert e.errors[:start_date.to_s].present?
e.end_date = Date.new(2008,01,05)
e.valid?
- assert !e.errors.invalid?(:start_date)
+ assert !e.errors[:start_date.to_s].present?
end
should 'find by range of dates' do
diff --git a/test/unit/input_test.rb b/test/unit/input_test.rb
index c136dab..fa626ea 100644
--- a/test/unit/input_test.rb
+++ b/test/unit/input_test.rb
@@ -7,11 +7,11 @@ class InputTest < ActiveSupport::TestCase
input = Input.new
input.valid?
- assert input.errors.invalid?(:product_category)
+ assert input.errors[:product_category.to_s].present?
input.product_category = product_category
input.valid?
- assert !input.errors.invalid?(:product_category)
+ assert !input.errors[:product_category.to_s].present?
end
should 'require product' do
@@ -20,11 +20,11 @@ class InputTest < ActiveSupport::TestCase
input = Input.new
input.valid?
- assert input.errors.invalid?(:product)
+ assert input.errors[:product.to_s].present?
input.product = product
input.valid?
- assert !input.errors.invalid?(:product)
+ assert !input.errors[:product.to_s].present?
end
should 'store inputs ordered by position' do
diff --git a/test/unit/invite_friend_test.rb b/test/unit/invite_friend_test.rb
index 2445acf..8780396 100644
--- a/test/unit/invite_friend_test.rb
+++ b/test/unit/invite_friend_test.rb
@@ -27,54 +27,54 @@ class InviteFriendTest < ActiveSupport::TestCase
task = InviteFriend.new
task.valid?
- ok('must not validate with empty requestor') { task.errors.invalid?(:requestor_id) }
+ ok('must not validate with empty requestor') { task.errors[:requestor_id.to_s].present? }
task.requestor = create_user('testuser2').person
task.valid?
- ok('must validate when requestor is given') { !task.errors.invalid?(:requestor_id)}
+ ok('must validate when requestor is given') { !task.errors[:requestor_id.to_s].present?}
end
should 'require friend email if no target given (person being invited)' do
task = InviteFriend.new
task.valid?
- ok('must not validate with empty target email') { task.errors.invalid?(:friend_email) }
+ ok('must not validate with empty target email') { task.errors[:friend_email.to_s].present? }
task.friend_email = 'test@test.com'
task.valid?
- ok('must validate when target email is given') { !task.errors.invalid?(:friend_email)}
+ ok('must validate when target email is given') { !task.errors[:friend_email.to_s].present?}
end
should 'dont require friend email if target given (person being invited)' do
task = InviteFriend.new(:target => create_user('testuser2').person)
task.valid?
- ok('must validate with empty target email') { !task.errors.invalid?(:friend_email) }
+ ok('must validate with empty target email') { !task.errors[:friend_email.to_s].present? }
end
should 'require target (person being invited) if no friend email given' do
task = InviteFriend.new
task.valid?
- ok('must not validate with no target') { task.errors.invalid?(:target_id) }
+ ok('must not validate with no target') { task.errors[:target_id.to_s].present? }
task.target = create_user('testuser2').person
task.valid?
- ok('must validate when target is given') { !task.errors.invalid?(:target_id)}
+ ok('must validate when target is given') { !task.errors[:target_id.to_s].present?}
end
should 'dont require target (person being invited) if friend email given' do
task = InviteFriend.new(:friend_email => "test@test.com")
task.valid?
- ok('must validate with no target') { !task.errors.invalid?(:target_id) }
+ ok('must validate with no target') { !task.errors[:target_id.to_s].present? }
end
should 'dont require message if target given (person being invited)' do
task = InviteFriend.new(:target => create_user('testuser2').person)
task.valid?
- ok('must validate with no target') { !task.errors.invalid?(:message) }
+ ok('must validate with no target') { !task.errors[:message.to_s].present? }
end
should 'not send e-mails to requestor' do
diff --git a/test/unit/invite_member_test.rb b/test/unit/invite_member_test.rb
index 3ea4cff..01c664d 100644
--- a/test/unit/invite_member_test.rb
+++ b/test/unit/invite_member_test.rb
@@ -26,35 +26,35 @@ class InviteMemberTest < ActiveSupport::TestCase
task = InviteMember.new
task.valid?
- ok('community is required') { task.errors.invalid?(:community_id) }
+ ok('community is required') { task.errors[:community_id.to_s].present? }
end
should 'require friend email if no target given (person being invited)' do
task = InviteMember.new
task.valid?
- ok('friend_email is required') { task.errors.invalid?(:friend_email) }
+ ok('friend_email is required') { task.errors[:friend_email.to_s].present? }
end
should 'dont require friend email if target given (person being invited)' do
task = InviteMember.new(:target => create_user('testuser2').person)
task.valid?
- ok('friend_email isnt required') { !task.errors.invalid?(:friend_email) }
+ ok('friend_email isnt required') { !task.errors[:friend_email.to_s].present? }
end
should 'require target (person being invited) if no friend email given' do
task = InviteMember.new
task.valid?
- ok('target is required') { task.errors.invalid?(:target_id) }
+ ok('target is required') { task.errors[:target_id.to_s].present? }
end
should 'dont require target (person being invited) if friend email given' do
task = InviteMember.new(:friend_email => "test@test.com")
task.valid?
- ok('target isn required') { !task.errors.invalid?(:target_id) }
+ ok('target isn required') { !task.errors[:target_id.to_s].present? }
end
should 'not send e-mails to requestor' do
diff --git a/test/unit/mailing_test.rb b/test/unit/mailing_test.rb
index 331e28f..510c1b3 100644
--- a/test/unit/mailing_test.rb
+++ b/test/unit/mailing_test.rb
@@ -23,31 +23,31 @@ class MailingTest < ActiveSupport::TestCase
should 'require source_id' do
mailing = Mailing.new
mailing.valid?
- assert mailing.errors.invalid?(:source_id)
+ assert mailing.errors[:source_id.to_s].present?
mailing.source_id = Environment.default.id
mailing.valid?
- assert !mailing.errors.invalid?(:source_id)
+ assert !mailing.errors[:source_id.to_s].present?
end
should 'require subject' do
mailing = Mailing.new
mailing.valid?
- assert mailing.errors.invalid?(:subject)
+ assert mailing.errors[:subject.to_s].present?
mailing.subject = 'Hello :)'
mailing.valid?
- assert !mailing.errors.invalid?(:subject)
+ assert !mailing.errors[:subject.to_s].present?
end
should 'require body' do
mailing = Mailing.new
mailing.valid?
- assert mailing.errors.invalid?(:body)
+ assert mailing.errors[:body.to_s].present?
mailing.body = 'We have some news!'
mailing.valid?
- assert !mailing.errors.invalid?(:body)
+ assert !mailing.errors[:body.to_s].present?
end
should 'return source' do
diff --git a/test/unit/organization_mailing_test.rb b/test/unit/organization_mailing_test.rb
index 33ad4b0..3beaa89 100644
--- a/test/unit/organization_mailing_test.rb
+++ b/test/unit/organization_mailing_test.rb
@@ -18,11 +18,11 @@ class OrganizationMailingTest < ActiveSupport::TestCase
should 'require source_id' do
mailing = OrganizationMailing.new
mailing.valid?
- assert mailing.errors.invalid?(:source_id)
+ assert mailing.errors[:source_id.to_s].present?
mailing.source_id = community.id
mailing.valid?
- assert !mailing.errors.invalid?(:source_id)
+ assert !mailing.errors[:source_id.to_s].present?
end
should 'return community name' do
diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb
index 945cd1d..98518a7 100644
--- a/test/unit/organization_test.rb
+++ b/test/unit/organization_test.rb
@@ -80,20 +80,20 @@ class OrganizationTest < ActiveSupport::TestCase
should 'validate contact_email if filled' do
org = Organization.new
org.valid?
- assert !org.errors.invalid?(:contact_email)
+ assert !org.errors[:contact_email.to_s].present?
org.contact_email = ''
org.valid?
- assert !org.errors.invalid?(:contact_email)
+ assert !org.errors[:contact_email.to_s].present?
org.contact_email = 'invalid-email'
org.valid?
- assert org.errors.invalid?(:contact_email)
+ assert org.errors[:contact_email.to_s].present?
org.contact_email = 'someone@somedomain.com'
org.valid?
- assert !org.errors.invalid?(:contact_email)
+ assert !org.errors[:contact_email.to_s].present?
end
should 'list contact_email plus admin emails as "notification emails"' do
@@ -183,15 +183,15 @@ class OrganizationTest < ActiveSupport::TestCase
org = Organization.new
org.foundation_year = 'xxxx'
org.valid?
- assert org.errors.invalid?(:foundation_year)
+ assert org.errors[:foundation_year.to_s].present?
org.foundation_year = 20.07
org.valid?
- assert org.errors.invalid?(:foundation_year)
+ assert org.errors[:foundation_year.to_s].present?
org.foundation_year = 2007
org.valid?
- assert ! org.errors.invalid?(:foundation_year)
+ assert ! org.errors[:foundation_year.to_s].present?
end
should 'has closed' do
@@ -393,11 +393,11 @@ class OrganizationTest < ActiveSupport::TestCase
should 'validates format of cnpj' do
organization = Organization.new(:cnpj => '239-234.234')
organization.valid?
- assert organization.errors.invalid?(:cnpj)
+ assert organization.errors[:cnpj.to_s].present?
organization.cnpj = '94.132.024/0001-48'
organization.valid?
- assert !organization.errors.invalid?(:cnpj)
+ assert !organization.errors[:cnpj.to_s].present?
end
should 'return members by role in a json format' do
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 2d7d1f6..65495b2 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -60,7 +60,7 @@ class PersonTest < ActiveSupport::TestCase
p2 = Person.new(:environment => Environment.default)
p2.user = u
assert !p2.valid?
- assert p2.errors.invalid?(:user_id)
+ assert p2.errors[:user_id.to_s].present?
end
should "have person info fields" do
@@ -133,7 +133,7 @@ class PersonTest < ActiveSupport::TestCase
other = create_user('seconduser', :email => 'other@domain.com').person
other.email = 'user@domain.com'
other.valid?
- assert other.errors.invalid?(:email)
+ assert other.errors[:email.to_s].present?
assert_no_match /\{fn\}/, other.errors.on(:email)
end
@@ -144,7 +144,7 @@ class PersonTest < ActiveSupport::TestCase
other = create_user('user', :email => 'other@example.com', :environment => other_env).person
other.email = 'user@example.com'
other.valid?
- assert !other.errors.invalid?(:email)
+ assert !other.errors[:email.to_s].present?
end
should 'be an admin if have permission of environment administration' do
@@ -318,7 +318,7 @@ class PersonTest < ActiveSupport::TestCase
should 'required name' do
person = Person.new(:environment => Environment.default)
assert !person.valid?
- assert person.errors.invalid?(:name)
+ assert person.errors[:name.to_s].present?
end
should 'already request friendship' do
@@ -463,11 +463,11 @@ class PersonTest < ActiveSupport::TestCase
e.expects(:required_person_fields).returns(['cell_phone']).at_least_once
person = Person.new(:environment => e)
assert ! person.valid?
- assert person.errors.invalid?(:cell_phone)
+ assert person.errors[:cell_phone.to_s].present?
person.cell_phone = '99999'
person.valid?
- assert ! person.errors.invalid?(:cell_phone)
+ assert ! person.errors[:cell_phone.to_s].present?
end
should 'require custom_area_of_study if area_of_study is others' do
@@ -476,11 +476,11 @@ class PersonTest < ActiveSupport::TestCase
person = Person.new(:environment => e, :area_of_study => 'Others')
assert !person.valid?
- assert person.errors.invalid?(:custom_area_of_study)
+ assert person.errors[:custom_area_of_study.to_s].present?
person.custom_area_of_study = 'Customized area of study'
person.valid?
- assert ! person.errors.invalid?(:custom_area_of_study)
+ assert ! person.errors[:custom_area_of_study.to_s].present?
end
should 'not require custom_area_of_study if area_of_study is not others' do
@@ -489,7 +489,7 @@ class PersonTest < ActiveSupport::TestCase
person = Person.new(:environment => e, :area_of_study => 'Agrometeorology')
person.valid?
- assert ! person.errors.invalid?(:custom_area_of_study)
+ assert ! person.errors[:custom_area_of_study.to_s].present?
end
should 'require custom_formation if formation is others' do
@@ -498,11 +498,11 @@ class PersonTest < ActiveSupport::TestCase
person = Person.new(:environment => e, :formation => 'Others')
assert !person.valid?
- assert person.errors.invalid?(:custom_formation)
+ assert person.errors[:custom_formation.to_s].present?
person.custom_formation = 'Customized formation'
person.valid?
- assert ! person.errors.invalid?(:custom_formation)
+ assert ! person.errors[:custom_formation.to_s].present?
end
should 'not require custom_formation if formation is not others' do
@@ -511,7 +511,7 @@ class PersonTest < ActiveSupport::TestCase
person = Person.new(:environment => e, :formation => 'Agrometeorology')
assert !person.valid?
- assert ! person.errors.invalid?(:custom_formation)
+ assert ! person.errors[:custom_formation.to_s].present?
end
should 'identify when person is a friend' do
@@ -1175,7 +1175,7 @@ class PersonTest < ActiveSupport::TestCase
should 'not accept an empty year on birth date' do
p = Person.new({"birth_date(2i)"=>"11", "birth_date(3i)"=>"15", "birth_date(1i)"=>""})
p.valid?
- assert p.errors.invalid?(:birth_date)
+ assert p.errors[:birth_date.to_s].present?
end
should 'associate report with the correct complaint' do
diff --git a/test/unit/product_test.rb b/test/unit/product_test.rb
index 594ba52..b0698c1 100644
--- a/test/unit/product_test.rb
+++ b/test/unit/product_test.rb
@@ -205,7 +205,7 @@ class ProductTest < ActiveSupport::TestCase
should 'not save without category' do
product = Product.new(:name => 'A product without category')
product.valid?
- assert product.errors.invalid?(:product_category_id)
+ assert product.errors[:product_category_id.to_s].present?
end
should 'not save with a invalid category' do
diff --git a/test/unit/production_cost_test.rb b/test/unit/production_cost_test.rb
index f266b37..715bf3f 100644
--- a/test/unit/production_cost_test.rb
+++ b/test/unit/production_cost_test.rb
@@ -5,11 +5,11 @@ class ProductionCostTest < ActiveSupport::TestCase
should 'have name' do
p = ProductionCost.new
p.valid?
- assert p.errors.invalid?(:name)
+ assert p.errors[:name.to_s].present?
p.name = 'Taxes'
p.valid?
- assert !p.errors.invalid?(:name)
+ assert !p.errors[:name.to_s].present?
end
should 'not validates name if it is blank' do
@@ -24,11 +24,11 @@ class ProductionCostTest < ActiveSupport::TestCase
p.name = 'a'*40
p.valid?
- assert p.errors.invalid?(:name)
+ assert p.errors[:name.to_s].present?
p.name = 'a'*30
p.valid?
- assert !p.errors.invalid?(:name)
+ assert !p.errors[:name.to_s].present?
end
should 'not have duplicated name on same environment' do
@@ -37,7 +37,7 @@ class ProductionCostTest < ActiveSupport::TestCase
invalid_cost = ProductionCost.new(:name => 'Taxes', :owner => Environment.default)
invalid_cost.valid?
- assert invalid_cost.errors.invalid?(:name)
+ assert invalid_cost.errors[:name.to_s].present?
end
should 'not have duplicated name on same enterprise' do
@@ -47,7 +47,7 @@ class ProductionCostTest < ActiveSupport::TestCase
invalid_cost = ProductionCost.new(:name => 'Taxes', :owner => enterprise)
invalid_cost.valid?
- assert invalid_cost.errors.invalid?(:name)
+ assert invalid_cost.errors[:name.to_s].present?
end
should 'not allow same name on enterprise if already has on environment' do
@@ -58,7 +58,7 @@ class ProductionCostTest < ActiveSupport::TestCase
cost2.valid?
- assert !cost2.errors.invalid?(:name)
+ assert !cost2.errors[:name.to_s].present?
end
should 'allow duplicated name on different enterprises' do
@@ -70,28 +70,28 @@ class ProductionCostTest < ActiveSupport::TestCase
cost2.valid?
- assert !cost2.errors.invalid?(:name)
+ assert !cost2.errors[:name.to_s].present?
end
should 'be associated to an environment as owner' do
p = ProductionCost.new
p.valid?
- assert p.errors.invalid?(:owner)
+ assert p.errors[:owner.to_s].present?
p.owner = Environment.default
p.valid?
- assert !p.errors.invalid?(:owner)
+ assert !p.errors[:owner.to_s].present?
end
should 'be associated to an enterprise as owner' do
enterprise = fast_create(Enterprise)
p = ProductionCost.new
p.valid?
- assert p.errors.invalid?(:owner)
+ assert p.errors[:owner.to_s].present?
p.owner = enterprise
p.valid?
- assert !p.errors.invalid?(:owner)
+ assert !p.errors[:owner.to_s].present?
end
should 'create a production cost on an enterprise' do
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index ade2bad..5c8467a 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -7,31 +7,31 @@ class ProfileTest < ActiveSupport::TestCase
def test_identifier_validation
p = Profile.new
p.valid?
- assert p.errors.invalid?(:identifier)
+ assert p.errors[:identifier.to_s].present?
p.identifier = 'with space'
p.valid?
- assert p.errors.invalid?(:identifier)
+ assert p.errors[:identifier.to_s].present?
p.identifier = 'áéíóú'
p.valid?
- assert p.errors.invalid?(:identifier)
+ assert p.errors[:identifier.to_s].present?
p.identifier = 'rightformat2007'
p.valid?
- assert ! p.errors.invalid?(:identifier)
+ assert ! p.errors[:identifier.to_s].present?
p.identifier = 'rightformat'
p.valid?
- assert ! p.errors.invalid?(:identifier)
+ assert ! p.errors[:identifier.to_s].present?
p.identifier = 'right_format'
p.valid?
- assert ! p.errors.invalid?(:identifier)
+ assert ! p.errors[:identifier.to_s].present?
p.identifier = 'identifier-with-dashes'
p.valid?
- assert ! p.errors.invalid?(:identifier), 'Profile should accept identifier with dashes'
+ assert ! p.errors[:identifier.to_s].present?, 'Profile should accept identifier with dashes'
end
def test_has_domains
@@ -81,10 +81,10 @@ class ProfileTest < ActiveSupport::TestCase
def test_name_should_be_mandatory
p = Profile.new
p.valid?
- assert p.errors.invalid?(:name)
+ assert p.errors[:name.to_s].present?
p.name = 'a very unprobable name'
p.valid?
- assert !p.errors.invalid?(:name)
+ assert !p.errors[:name.to_s].present?
end
def test_can_have_affiliated_people
@@ -1348,12 +1348,12 @@ class ProfileTest < ActiveSupport::TestCase
template = fast_create(Profile)
profile = Profile.new(:template => template)
!profile.valid?
- assert profile.errors.invalid?(:template)
+ assert profile.errors[:template.to_s].present?
template.is_template = true
template.save!
profile.valid?
- assert !profile.errors.invalid?(:template)
+ assert !profile.errors[:template.to_s].present?
end
should 'be able to have a template' do
@@ -1491,7 +1491,7 @@ class ProfileTest < ActiveSupport::TestCase
profile = Profile.new
profile.description = long_description
profile.valid?
- assert profile.errors.invalid?(:description)
+ assert profile.errors[:description.to_s].present?
end
should 'sanitize name before validation' do
@@ -1499,7 +1499,7 @@ class ProfileTest < ActiveSupport::TestCase
profile.name = ""
profile.valid?
- assert profile.errors.invalid?(:name)
+ assert profile.errors[:name.to_s].present?
end
should 'filter fields with white_list filter' do
@@ -1778,7 +1778,7 @@ class ProfileTest < ActiveSupport::TestCase
def assert_invalid_identifier(id)
profile = Profile.new(:identifier => id)
assert !profile.valid?
- assert profile.errors.invalid?(:identifier)
+ assert profile.errors[:identifier.to_s].present?
end
should 'respond to redirection_after_login' do
@@ -1801,12 +1801,12 @@ class ProfileTest < ActiveSupport::TestCase
profile = fast_create(Profile)
profile.redirection_after_login = 'invalid_option'
profile.save
- assert profile.errors.invalid?(:redirection_after_login)
+ assert profile.errors[:redirection_after_login.to_s].present?
Environment.login_redirection_options.keys.each do |redirection|
profile.redirection_after_login = redirection
profile.save
- assert !profile.errors.invalid?(:redirection_after_login)
+ assert !profile.errors[:redirection_after_login.to_s].present?
end
end
diff --git a/test/unit/rss_feed_test.rb b/test/unit/rss_feed_test.rb
index 939ec5c..19708ac 100644
--- a/test/unit/rss_feed_test.rb
+++ b/test/unit/rss_feed_test.rb
@@ -15,7 +15,7 @@ class RssFeedTest < ActiveSupport::TestCase
:search => 'parent_and_children',
}
feed.valid?
- assert !feed.errors.invalid?('body')
+ assert !feed.errors['body'.to_s].present?
end
should 'alias body as "settings"' do
@@ -160,25 +160,25 @@ class RssFeedTest < ActiveSupport::TestCase
feed = RssFeed.new
feed.limit = 'text'
feed.valid?
- assert feed.errors.invalid?(:limit)
+ assert feed.errors[:limit.to_s].present?
feed.limit = 10
feed.valid?
- assert !feed.errors.invalid?(:limit)
+ assert !feed.errors[:limit.to_s].present?
end
should 'allow only parent_and_children and all as include setting' do
feed = RssFeed.new
feed.include = :something_else
feed.valid?
- assert feed.errors.invalid?(:include)
+ assert feed.errors[:include.to_s].present?
feed.include = 'parent_and_children'
feed.valid?
- assert !feed.errors.invalid?(:include)
+ assert !feed.errors[:include.to_s].present?
feed.include = 'all'
feed.valid?
- assert !feed.errors.invalid?(:include)
+ assert !feed.errors[:include.to_s].present?
end
should 'provide proper short description' do
diff --git a/test/unit/scrap_test.rb b/test/unit/scrap_test.rb
index b0173d1..ecbb4b4 100644
--- a/test/unit/scrap_test.rb
+++ b/test/unit/scrap_test.rb
@@ -4,35 +4,35 @@ class ScrapTest < ActiveSupport::TestCase
should "have the content" do
s = Scrap.new
s.valid?
- assert s.errors.invalid?(:content)
+ assert s.errors[:content.to_s].present?
s.content = ''
s.valid?
- assert s.errors.invalid?(:content)
+ assert s.errors[:content.to_s].present?
s.content = 'some content'
s.valid?
- assert !s.errors.invalid?(:content)
+ assert !s.errors[:content.to_s].present?
end
should "have the sender" do
s = Scrap.new
s.valid?
- assert s.errors.invalid?(:sender_id)
+ assert s.errors[:sender_id.to_s].present?
s.sender_id = 1
s.valid?
- assert !s.errors.invalid?(:sender_id)
+ assert !s.errors[:sender_id.to_s].present?
end
should "have the receiver" do
s = Scrap.new
s.valid?
- assert s.errors.invalid?(:receiver_id)
+ assert s.errors[:receiver_id.to_s].present?
s.receiver_id = 1
s.valid?
- assert !s.errors.invalid?(:receiver_id)
+ assert !s.errors[:receiver_id.to_s].present?
end
should "be associated to Person as sender" do
diff --git a/test/unit/suggest_article_test.rb b/test/unit/suggest_article_test.rb
index 7381687..ed67301 100644
--- a/test/unit/suggest_article_test.rb
+++ b/test/unit/suggest_article_test.rb
@@ -12,37 +12,37 @@ class SuggestArticleTest < ActiveSupport::TestCase
should 'have the article_name' do
t = SuggestArticle.new
- assert !t.errors.invalid?(:article_name)
+ assert !t.errors[:article_name.to_s].present?
t.valid?
- assert t.errors.invalid?(:article_name)
+ assert t.errors[:article_name.to_s].present?
end
should 'have the article_body' do
t = SuggestArticle.new
- assert !t.errors.invalid?(:article_body)
+ assert !t.errors[:article_body.to_s].present?
t.valid?
- assert t.errors.invalid?(:article_body)
+ assert t.errors[:article_body.to_s].present?
end
should 'have the email' do
t = SuggestArticle.new
- assert !t.errors.invalid?(:email)
+ assert !t.errors[:email.to_s].present?
t.valid?
- assert t.errors.invalid?(:email)
+ assert t.errors[:email.to_s].present?
end
should 'have the name' do
t = SuggestArticle.new
- assert !t.errors.invalid?(:name)
+ assert !t.errors[:name.to_s].present?
t.valid?
- assert t.errors.invalid?(:name)
+ assert t.errors[:name.to_s].present?
end
should 'have the target_id' do
t = SuggestArticle.new
- assert !t.errors.invalid?(:target_id)
+ assert !t.errors[:target_id.to_s].present?
t.valid?
- assert t.errors.invalid?(:target_id)
+ assert t.errors[:target_id.to_s].present?
end
should 'have the article_abstract' do
diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb
index db4c9e6..a6e8aa6 100644
--- a/test/unit/task_test.rb
+++ b/test/unit/task_test.rb
@@ -115,7 +115,7 @@ class TaskTest < ActiveSupport::TestCase
task2 = Task.new(:code => task1.code)
assert !task2.valid?
- assert task2.errors.invalid?(:code)
+ assert task2.errors[:code.to_s].present?
end
should 'generate a code with chars from a-z and 0-9' do
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index da8dc90..b353b71 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -90,27 +90,27 @@ class UserTest < ActiveSupport::TestCase
def test_login_validation
u = User.new
u.valid?
- assert u.errors.invalid?(:login)
+ assert u.errors[:login.to_s].present?
u.login = 'with space'
u.valid?
- assert u.errors.invalid?(:login)
+ assert u.errors[:login.to_s].present?
u.login = 'áéíóú'
u.valid?
- assert u.errors.invalid?(:login)
+ assert u.errors[:login.to_s].present?
u.login = 'rightformat2007'
u.valid?
- assert ! u.errors.invalid?(:login)
+ assert ! u.errors[:login.to_s].present?
u.login = 'rightformat'
u.valid?
- assert ! u.errors.invalid?(:login)
+ assert ! u.errors[:login.to_s].present?
u.login = 'right_format'
u.valid?
- assert ! u.errors.invalid?(:login)
+ assert ! u.errors[:login.to_s].present?
end
def test_should_change_password
--
libgit2 0.21.2