Download as
Browse Code »

Commit 85f62237d13fb68c52d5c0068a218f4b0f614a73

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 9b1f10f9
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

ActionItem1183: fixed error with profile saved without image

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
lib/acts_as_having_image.rb
  Diff comments   View file @85f6223
@@ -12,7 +12,7 @@ module ActsAsHavingImage @@ -12,7 +12,7 @@ module ActsAsHavingImage
12 image.attributes = img 12 image.attributes = img
13 else 13 else
14 build_image(img) 14 build_image(img)
15 - end 15 + end unless img[:uploaded_data].blank?
16 end 16 end
17 17
18 end 18 end
test/unit/profile_test.rb
  Diff comments   View file @85f6223
@@ -1352,6 +1352,16 @@ class ProfileTest < Test::Unit::TestCase @@ -1352,6 +1352,16 @@ class ProfileTest < Test::Unit::TestCase
1352 assert !profile.valid? 1352 assert !profile.valid?
1353 end 1353 end
1354 1354
  1355 + should 'profile be valid when image is empty' do
  1356 + profile = Profile.create!(:name => 'Profile for testing ', :identifier => 'profilefortesting', :image_builder => {:uploaded_data => ""})
  1357 + assert_valid profile
  1358 + end
  1359 +
  1360 + should 'profile be valid when has no image' do
  1361 + profile = Profile.create!(:name => 'Profile for testing ', :identifier => 'profilefortesting')
  1362 + assert_valid profile
  1363 + end
  1364 +
1355 should 'copy header and footer after create a person' do 1365 should 'copy header and footer after create a person' do
1356 template = create_user('template').person 1366 template = create_user('template').person
1357 template.custom_footer = "footer customized" 1367 template.custom_footer = "footer customized"