Download as
Browse Code »

Commit 80976a8c1072e40ff0833b8b28c0cc415856aabb

Authored by Victor Costa
1 parent 1a6ac2de
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

rails3: fix themes_controller

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/models/theme.rb
  Diff comments   View file @80976a8
@@ -111,7 +111,7 @@ class Theme @@ -111,7 +111,7 @@ class Theme
111 111
112 def add_image(filename, data) 112 def add_image(filename, data)
113 FileUtils.mkdir_p(images_directory) 113 FileUtils.mkdir_p(images_directory)
114 - File.open(image_path(filename), 'w') do |f| 114 + File.open(image_path(filename), 'wb') do |f|
115 f.write(data) 115 f.write(data)
116 end 116 end
117 end 117 end
test/functional/themes_controller_test.rb
  Diff comments   View file @80976a8
@@ -216,7 +216,7 @@ class ThemesControllerTest < ActionController::TestCase @@ -216,7 +216,7 @@ class ThemesControllerTest < ActionController::TestCase
216 post :add_image, :profile => 'testinguser', :id => 'mytheme', :image => fixture_file_upload('/files/rails.png', 'image/png', :binary) 216 post :add_image, :profile => 'testinguser', :id => 'mytheme', :image => fixture_file_upload('/files/rails.png', 'image/png', :binary)
217 assert_redirected_to :action => "edit", :id => 'mytheme' 217 assert_redirected_to :action => "edit", :id => 'mytheme'
218 assert theme.image_files.include?('rails.png') 218 assert theme.image_files.include?('rails.png')
219 - assert(system('diff', Rails.root.join('test', 'fixtures', 'files','rails.png'), TMP_THEMES_DIR + '/mytheme/images/rails.png'), 'should put the correct uploaded file in the right place') 219 + assert(system('diff', Rails.root.join('test', 'fixtures', 'files','rails.png').to_s, TMP_THEMES_DIR.join('mytheme/images/rails.png').to_s), 'should put the correct uploaded file in the right place')
220 end 220 end
221 221
222 should 'link to "test theme"' do 222 should 'link to "test theme"' do