From 2638f65f2ccb4ec2a4108b124e06c2c61e03c4e6 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Fri, 27 Sep 2013 17:00:11 -0300 Subject: [PATCH] rails3: fix create_enterprise tests --- app/models/create_enterprise.rb | 6 +++++- test/unit/create_enterprise_test.rb | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb index 4a5ff04..dac44f2 100644 --- a/app/models/create_enterprise.rb +++ b/app/models/create_enterprise.rb @@ -36,14 +36,18 @@ class CreateEnterprise < Task validates_presence_of :reject_explanation, :if => (lambda { |record| record.status == Task::Status::CANCELLED } ) xss_terminate :only => [ :acronym, :address, :contact_person, :contact_phone, :economic_activity, :legal_form, :management_information, :name ], :on => 'validation' - def validate + validate :validator_correct_region + validate :not_used_identifier + def validator_correct_region if self.region && self.target unless self.region.validators.include?(self.target) || self.target_type == "Environment" self.errors.add(:target, _('%{fn} is not a validator for the chosen region').fix_i18n) end end + end + def not_used_identifier if self.status != Task::Status::CANCELLED && self.identifier && Profile.exists?(:identifier => self.identifier) self.errors.add(:identifier, _('%{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n) end diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb index fc00b5a..3d44b86 100644 --- a/test/unit/create_enterprise_test.rb +++ b/test/unit/create_enterprise_test.rb @@ -232,11 +232,11 @@ class CreateEnterpriseTest < ActiveSupport::TestCase request.stubs(:environment).returns(Environment.default) request.identifier = 'testid' request.valid? - assert !request.errors[:identifier.to_s].present? + assert request.errors[:identifier].blank? Organization.create!(:name => 'test', :identifier => 'testid') request.valid? - assert request.errors[:identifier.to_s].present? + assert request.errors[:identifier].present? end should 'require the same fields as an enterprise does' do @@ -247,11 +247,11 @@ class CreateEnterpriseTest < ActiveSupport::TestCase environment.stubs(:required_enterprise_fields).returns([]) request.valid? - assert_nil request.errors[:contact_person], 'should not require contact_person unless Enterprise requires it' + assert request.errors[:contact_person].blank?, 'should not require contact_person unless Enterprise requires it' environment.stubs(:required_enterprise_fields).returns(['contact_person']) request.valid? - assert_not_nil request.errors[:contact_person], 'should require contact_person when Enterprise requires it' + assert request.errors[:contact_person].present?, 'should require contact_person when Enterprise requires it' end should 'has permission to validate enterprise' do -- libgit2 0.21.2