Download as
Browse Code »

Commit 2638f65f2ccb4ec2a4108b124e06c2c61e03c4e6

Authored by Rodrigo Souto
1 parent 3d5b4650
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

rails3: fix create_enterprise tests 

PS: still failing due to mailer deliver problem.
Showing 2 changed files with 9 additions and 5 deletions   Show diff stats
app/models/create_enterprise.rb
  Diff comments   View file @2638f65
... ... @@ -36,14 +36,18 @@ class CreateEnterprise < Task
36 36 validates_presence_of :reject_explanation, :if => (lambda { |record| record.status == Task::Status::CANCELLED } )
37 37 xss_terminate :only => [ :acronym, :address, :contact_person, :contact_phone, :economic_activity, :legal_form, :management_information, :name ], :on => 'validation'
38 38  
39   - def validate
  39 + validate :validator_correct_region
  40 + validate :not_used_identifier
40 41  
  42 + def validator_correct_region
41 43 if self.region && self.target
42 44 unless self.region.validators.include?(self.target) || self.target_type == "Environment"
43 45 self.errors.add(:target, _('%{fn} is not a validator for the chosen region').fix_i18n)
44 46 end
45 47 end
  48 + end
46 49  
  50 + def not_used_identifier
47 51 if self.status != Task::Status::CANCELLED && self.identifier && Profile.exists?(:identifier => self.identifier)
48 52 self.errors.add(:identifier, _('%{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
49 53 end
... ...
test/unit/create_enterprise_test.rb
  Diff comments   View file @2638f65
... ... @@ -232,11 +232,11 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
232 232 request.stubs(:environment).returns(Environment.default)
233 233 request.identifier = 'testid'
234 234 request.valid?
235   - assert !request.errors[:identifier.to_s].present?
  235 + assert request.errors[:identifier].blank?
236 236  
237 237 Organization.create!(:name => 'test', :identifier => 'testid')
238 238 request.valid?
239   - assert request.errors[:identifier.to_s].present?
  239 + assert request.errors[:identifier].present?
240 240 end
241 241  
242 242 should 'require the same fields as an enterprise does' do
... ... @@ -247,11 +247,11 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
247 247  
248 248 environment.stubs(:required_enterprise_fields).returns([])
249 249 request.valid?
250   - assert_nil request.errors[:contact_person], 'should not require contact_person unless Enterprise requires it'
  250 + assert request.errors[:contact_person].blank?, 'should not require contact_person unless Enterprise requires it'
251 251  
252 252 environment.stubs(:required_enterprise_fields).returns(['contact_person'])
253 253 request.valid?
254   - assert_not_nil request.errors[:contact_person], 'should require contact_person when Enterprise requires it'
  254 + assert request.errors[:contact_person].present?, 'should require contact_person when Enterprise requires it'
255 255 end
256 256  
257 257 should 'has permission to validate enterprise' do
... ...