Download as
Browse Code »

Commit f44afb44049f61b5336d67d2582ccff965813391

Authored by AntonioTerceiro
1 parent a0b4958a
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

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,7 +44,7 @@ class Organization < Profile
44 44
45 validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT 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 xss_terminate :only => [ :acronym, :contact_person, :contact_email, :legal_form, :economic_activity, :management_information ] 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,6 +77,25 @@ class OrganizationTest < Test::Unit::TestCase
77 assert_respond_to org, :contact_email 77 assert_respond_to org, :contact_email
78 end 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 should 'list pending enterprise validations' do 99 should 'list pending enterprise validations' do
81 org = Organization.new 100 org = Organization.new
82 assert_kind_of Array, org.pending_validations 101 assert_kind_of Array, org.pending_validations