Download as
Browse Code »

Commit f44afb44049f61b5336d67d2582ccff965813391

Authored by AntonioTerceiro
1 parent a0b4958a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem500: s/nil/blank/ 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2098 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 20 additions and 1 deletions   Show diff stats
app/models/organization.rb
  Diff comments   View file @f44afb4
... ... @@ -44,7 +44,7 @@ class Organization < Profile
44 44  
45 45 validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
46 46  
47   - validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.nil? })
  47 + validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
48 48  
49 49 xss_terminate :only => [ :acronym, :contact_person, :contact_email, :legal_form, :economic_activity, :management_information ]
50 50  
... ...
test/unit/organization_test.rb
  Diff comments   View file @f44afb4
... ... @@ -77,6 +77,25 @@ class OrganizationTest < Test::Unit::TestCase
77 77 assert_respond_to org, :contact_email
78 78 end
79 79  
  80 + should 'validate contact_email if filled' do
  81 + org = Organization.new
  82 + org.valid?
  83 + assert !org.errors.invalid?(:contact_email)
  84 +
  85 + org.contact_email = ''
  86 + org.valid?
  87 + assert !org.errors.invalid?(:contact_email)
  88 +
  89 +
  90 + org.contact_email = 'invalid-email'
  91 + org.valid?
  92 + assert org.errors.invalid?(:contact_email)
  93 +
  94 + org.contact_email = 'someone@somedomain.com'
  95 + org.valid?
  96 + assert !org.errors.invalid?(:contact_email)
  97 + end
  98 +
80 99 should 'list pending enterprise validations' do
81 100 org = Organization.new
82 101 assert_kind_of Array, org.pending_validations
... ...