Download as
Browse Code »

Commit 1c68caa0f2dc515b7523165187cb403dd074d5d1

Authored by Aurélio A. Heckert
1 parent 331e4e98
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

Makes FilePresenter to work with all noosfero tests II 

ActionItem2373
Showing 9 changed files with 33 additions and 14 deletions   Show diff stats
app/helpers/blog_helper.rb
  Diff comments   View file @1c68caa
... ... @@ -42,7 +42,7 @@ module BlogHelper
42 42  
43 43 def display_post(article, format = 'full')
44 44 no_comments = (format == 'full') ? false : true
45   - html = send("display_#{format}_format", article)
  45 + html = send "display_#{format}_format", FilePresenter.for(article)
46 46  
47 47 article_title(article, :no_comments => no_comments) + html
48 48 end
... ...
app/models/article_block.rb
  Diff comments   View file @1c68caa
... ... @@ -12,7 +12,7 @@ class ArticleBlock < Block
12 12 block = self
13 13 lambda do
14 14 block_title(block.title) +
15   - (block.article ? article_to_html(block.article,
  15 + (block.article ? article_to_html(FilePresenter.for(block.article),
16 16 :gallery_view => false,
17 17 :inside_block => block, # For Blogs and folders
18 18 :format => block.visualization_format # For Articles and contents
... ...
lib/file_presenter/image.rb
  Diff comments   View file @1c68caa
... ... @@ -4,6 +4,7 @@ class FilePresenter::Image < FilePresenter
4 4 end
5 5  
6 6 def self.accepts?(f)
  7 + return nil unless f.respond_to? :image?
7 8 f.image? ? 10 : nil
8 9 end
9 10  
... ...
plugins/html5_video/lib/file_presenter/video.rb
  Diff comments   View file @1c68caa
... ... @@ -4,7 +4,7 @@ class FilePresenter::Video < FilePresenter
4 4 end
5 5  
6 6 def self.accepts?(f)
7   - return nil if f.content_type.nil?
  7 + return nil if !f.respond_to?(:content_type) || f.content_type.nil?
8 8 ( f.content_type[0..4] == 'video' ) ? 10 : nil
9 9 end
10 10  
... ...
test/unit/article_block_test.rb
  Diff comments   View file @1c68caa
... ... @@ -110,9 +110,12 @@ class ArticleBlockTest < ActiveSupport::TestCase
110 110 block.article = image
111 111 block.save!
112 112  
113   - expects(:image_tag).with(image.public_filename(:display), :class => image.css_class_name, :style => 'max-width: 100%').returns('image')
114   -
115   - assert_match(/image/, instance_eval(&block.content))
  113 + assert_tag_in_string instance_eval(&block.content),
  114 + :tag => 'img',
  115 + :attributes => {
  116 + :src => image.public_filename(:display),
  117 + :class => /file-image/
  118 + }
116 119 end
117 120  
118 121 should 'not display gallery pages navigation in content' do
... ... @@ -123,8 +126,6 @@ class ArticleBlockTest < ActiveSupport::TestCase
123 126 block.article = image
124 127 block.save!
125 128  
126   - expects(:image_tag).with(image.public_filename(:display), :class => image.css_class_name, :style => 'max-width: 100%').returns('image')
127   -
128 129 assert_no_match(/Previous/, instance_eval(&block.content))
129 130 end
130 131  
... ...
test/unit/blog_helper_test.rb
  Diff comments   View file @1c68caa
... ... @@ -94,10 +94,10 @@ class BlogHelperTest < ActiveSupport::TestCase
94 94 should 'display link to file if post is an uploaded_file' do
95 95 file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => profile, :published => true, :parent => blog)
96 96  
97   - expects(:article_to_html).with(file).returns('TO HTML')
98   -
99 97 result = display_post(file)
100   - assert_tag_in_string result, :content => /TO HTML/
  98 + assert_tag_in_string result, :tag => 'a',
  99 + :attributes => { :href => file.public_filename },
  100 + :content => file.filename
101 101 end
102 102  
103 103 should 'display image if post is an image' do
... ...
test/unit/file_presenter_test.rb
  Diff comments   View file @1c68caa
... ... @@ -40,4 +40,22 @@ class FilePresenterTest < ActiveSupport::TestCase
40 40 assert_equal '/path/to/file.xyz', p.icon_name
41 41 end
42 42  
  43 + should 'not crach when accepts? method receives a pure article' do
  44 + assert_nothing_raised do
  45 + FilePresenter.for Article.new
  46 + end
  47 + end
  48 +
  49 + should 'not crach when accepts? method receives a non-sense object' do
  50 + assert_nothing_raised do
  51 + FilePresenter.for nil
  52 + end
  53 + assert_nothing_raised do
  54 + FilePresenter.for({:key => 'value'})
  55 + end
  56 + assert_nothing_raised do
  57 + FilePresenter.for 'a string'
  58 + end
  59 + end
  60 +
43 61 end
... ...
test/unit/profile_list_block_test.rb
  Diff comments   View file @1c68caa
... ... @@ -2,6 +2,8 @@ require File.dirname(__FILE__) + '/../test_helper'
2 2  
3 3 class ProfileListBlockTest < ActiveSupport::TestCase
4 4  
  5 + include ActionView::Helpers::TagHelper
  6 +
5 7 should 'describe itself' do
6 8 assert_not_equal Block.description, ProfileListBlock.description
7 9 end
... ...
test/unit/uploaded_file_test.rb
  Diff comments   View file @1c68caa
... ... @@ -8,9 +8,6 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
8 8 attr_reader :profile
9 9  
10 10 should 'return a default icon for uploaded files' do
11   - ENV.stubs('[]').with('RAILS_ENV').returns('other')
12   - Rails.logger.expects(:warn) # warn about deprecatede usage of UploadedFile.icon_name
13   - stubs(:puts)
14 11 assert_equal 'upload-file', UploadedFile.icon_name
15 12 end
16 13  
... ...