Download as
Browse Code »

Commit dd2870128afd53b714e1275ffd25e835c35ef118

Authored by Daniela Feitosa
2 parents da6c1271 72790af0
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge branch 'AI3131' of https://gitlab.com/arthurmde/noosfero into AI3131

Showing 2 changed files with 16 additions and 0 deletions   Show diff stats
app/presenters/image.rb
  Diff comments   View file @dd28701
... ... @@ -11,4 +11,8 @@ class FilePresenter::Image < FilePresenter
11 11 def short_description
12 12 _('Image (%s)') % content_type.split('/')[1].upcase
13 13 end
  14 +
  15 + def download? view = nil
  16 + view.blank? || view == 'false'
  17 + end
14 18 end
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @dd28701
... ... @@ -75,6 +75,18 @@ class ContentViewerControllerTest < ActionController::TestCase
75 75 assert_match /#{html.public_filename}/, @response.body
76 76 end
77 77  
  78 + should 'produce a download-link when article is a image' do
  79 + profile = create_user('someone').person
  80 + image = UploadedFile.create! :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile
  81 + image.save!
  82 +
  83 + get :view_page, :profile => 'someone', :page => [ 'rails.png' ]
  84 +
  85 + assert_response :success
  86 + assert_not_nil assigns(:page).data
  87 + assert_match /image/, @response.headers['Content-Type']
  88 + end
  89 +
78 90 should 'produce a download-link when article is not text/html' do
79 91  
80 92 # for example, RSS feeds
... ...