Download as
Browse Code »

Commit 2cee8f5724b1ac9d41fb1379bca550d5f095cebb

Authored by Braulio Bhavamitra
1 parent 3c57da65
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, 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, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: fix more unit tests

Showing 18 changed files with 91 additions and 67 deletions   Show diff stats
app/models/create_enterprise.rb
  Diff comments   View file @2cee8f5
... ... @@ -22,7 +22,7 @@ class CreateEnterprise < Task
22 22 #checks if the validation method is region to validates
23 23 validates_presence_of :region_id, :if => lambda { |obj| obj.environment.organization_approval_method == :region }
24 24  
25   - validates_format_of :foundation_year, :with => /\d*/
  25 + validates_numericality_of :foundation_year, only_integer: true
26 26  
27 27 # checks for actual attributes
28 28 validates_presence_of :requestor_id, :target_id
... ...
app/models/domain.rb
  Diff comments   View file @2cee8f5
... ... @@ -14,7 +14,7 @@ class Domain < ActiveRecord::Base
14 14  
15 15 # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
16 16 # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
17   - validates_format_of :name, :with => /([a-z0-9_-]+\.)+[a-z0-9_-]+/, :message => N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
  17 + validates_format_of :name, with: /\A([a-z0-9_-]+\.)+[a-z0-9_-]+\z/, message: N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
18 18  
19 19 # checks validations that could not be expressed using Rails' predefined
20 20 # validations. In particular:
... ...
app/models/image.rb
  Diff comments   View file @2cee8f5
1 1 class Image < ActiveRecord::Base
2 2  
  3 + attr_accessible :uploaded_data, :label
  4 +
3 5 def self.max_size
4 6 Image.attachment_options[:max_size]
5 7 end
... ... @@ -24,8 +26,6 @@ class Image &lt; ActiveRecord::Base
24 26  
25 27 postgresql_attachment_fu
26 28  
27   - attr_accessible :uploaded_data, :label
28   -
29 29 def current_data
30 30 File.file?(full_filename) ? File.read(full_filename) : nil
31 31 end
... ...
app/models/person_notifier.rb
  Diff comments   View file @2cee8f5
  1 +# FIXME needed by test/units/application_helper.rb
  2 +require_dependency 'application_helper'
  3 +
1 4 class PersonNotifier
2 5  
3 6 def initialize(person)
... ... @@ -76,7 +79,7 @@ class PersonNotifier
76 79  
77 80 class Mailer < ActionMailer::Base
78 81  
79   - add_template_helper(ApplicationHelper)
  82 + helper ApplicationHelper
80 83  
81 84 def session
82 85 {:theme => nil}
... ... @@ -93,7 +96,7 @@ class PersonNotifier
93 96 @recipient = @profile.nickname || @profile.name
94 97 @notifications = notifications
95 98 @tasks = tasks
96   - @environment = @profile.environment.name
  99 + @environment = @profile.environment
97 100 @url = @profile.environment.top_url
98 101 mail(
99 102 content_type: "text/html",
... ...
app/models/profile.rb
  Diff comments   View file @2cee8f5
... ... @@ -98,7 +98,9 @@ class Profile &lt; ActiveRecord::Base
98 98 where((Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
99 99 }
100 100 scope :templates, -> (template_id = nil) {
101   - if template_id then where id: template_id else where is_template: true end
  101 + s = where is_template: true
  102 + s = s.where id: template_id if template_id
  103 + s
102 104 }
103 105  
104 106 scope :with_templates, -> (templates) {
... ...
app/views/person_notifier/mailer/content_summary.html.erb
  Diff comments   View file @2cee8f5
... ... @@ -25,7 +25,7 @@
25 25 <% @notifications.each do |activity| %>
26 26 <div style="border-bottom:1px solid #e2e2e2;padding:15px 0;width:600px">
27 27 <table style="width:100%;">
28   - <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %>
  28 + <%= render activity.verb, activity: activity %>
29 29 </table>
30 30 </div>
31 31 <% end %>
... ...
config/initializers/dependencies.rb
  Diff comments   View file @2cee8f5
... ... @@ -6,7 +6,7 @@ require &#39;will_paginate/array&#39;
6 6 require 'nokogiri'
7 7  
8 8 # dependencies at vendor, firstly loaded on Gemfile
9   -vendor = (Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins'])
  9 +vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
10 10 vendor.each do |dir|
11 11 init_rb = "#{Rails.root}/#{dir}/init.rb"
12 12 require init_rb if File.file? init_rb
... ... @@ -24,3 +24,4 @@ require &#39;set_profile_region_from_city_state&#39;
24 24 require 'authenticated_system'
25 25 require 'needs_profile'
26 26 require 'white_list_filter'
  27 +
... ...
lib/noosfero/core_ext/array.rb
View file @3c57da6
... ... @@ -1,9 +0,0 @@
1   -class Array
2   -
3   - def uniq_by
4   - hash, array = {}, []
5   - each { |i| hash[yield(i)] ||= (array << i) }
6   - array
7   - end
8   -
9   -end
test/unit/array_core_ext_test.rb
View file @3c57da6
... ... @@ -1,11 +0,0 @@
1   -require_relative "../test_helper"
2   -
3   -# tests for Array core extension. See lib/noosfero/core_ext/array.rb
4   -class StringCoreExtTest < ActiveSupport::TestCase
5   -
6   - should 'allow uniq by a block' do
7   - array = [0,1,2,3,4,5,6]
8   - assert_equal [0,1], array.uniq_by {|number| number%2 }
9   - end
10   -
11   -end
test/unit/block_test.rb
  Diff comments   View file @2cee8f5
... ... @@ -248,7 +248,8 @@ class BlockTest &lt; ActiveSupport::TestCase
248 248 should 'generate embed code' do
249 249 b = Block.new
250 250 b.stubs(:url_for).returns('http://myblogtest.com/embed/block/1')
251   - assert_equal "<iframe class=\"embed block block\" frameborder=\"0\" height=\"768\" src=\"http://myblogtest.com/embed/block/1\" width=\"1024\"></iframe>", b.embed_code.call
  251 + assert_equal "<iframe class=\"embed block block\" frameborder=\"0\" height=\"768\" src=\"http://myblogtest.com/embed/block/1\" width=\"1024\"></iframe>",
  252 + b.embed_code.call
252 253 end
253 254  
254 255 should 'default value for display_user is all' do
... ...
test/unit/create_enterprise_test.rb
  Diff comments   View file @2cee8f5
... ... @@ -15,18 +15,18 @@ class CreateEnterpriseTest &lt; ActiveSupport::TestCase
15 15 assert task.respond_to?("#{field}=")
16 16 end
17 17 end
18   -
  18 +
19 19 should 'accept only numbers as foundation year' do
20 20 task = CreateEnterprise.new
21 21 task.stubs(:environment).returns(Environment.default)
22 22  
23 23 task.foundation_year = "test"
24 24 task.valid?
25   - assert task.errors[:foundation_year.to_s].present?
  25 + assert task.errors[:foundation_year].present?
26 26  
27 27 task.foundation_year = 2006
28 28 task.valid?
29   - assert !task.errors[:foundation_year.to_s].present?
  29 + assert !task.errors[:foundation_year].present?
30 30 end
31 31  
32 32 should 'require a requestor' do
... ... @@ -65,7 +65,7 @@ class CreateEnterpriseTest &lt; ActiveSupport::TestCase
65 65  
66 66 task.valid?
67 67 assert task.errors[:target.to_s].present?
68   -
  68 +
69 69 region.validators << validator
70 70  
71 71 task.valid?
... ...
test/unit/domain_test.rb
  Diff comments   View file @2cee8f5
... ... @@ -10,37 +10,37 @@ class DomainTest &lt; ActiveSupport::TestCase
10 10 should 'not allow domains without name' do
11 11 domain = Domain.new
12 12 domain.valid?
13   - assert domain.errors[:name.to_s].present?
  13 + assert domain.errors[:name].present?
14 14 end
15 15  
16 16 should 'not allow domain without dot' do
17 17 domain = build(Domain, :name => 'test')
18 18 domain.valid?
19   - assert domain.errors[:name.to_s].present?
  19 + assert domain.errors[:name].present?
20 20 end
21 21  
22 22 should 'allow domains with dot' do
23 23 domain = build(Domain, :name => 'test.org')
24 24 domain.valid?
25   - assert !domain.errors[:name.to_s].present?
  25 + assert !domain.errors[:name].present?
26 26 end
27 27  
28 28 should 'not allow domains with upper cased letters' do
29 29 domain = build(Domain, :name => 'tEst.org')
30 30 domain.valid?
31   - assert domain.errors[:name.to_s].present?
  31 + assert domain.errors[:name].present?
32 32 end
33 33  
34 34 should 'allow domains with hyphen' do
35 35 domain = build(Domain, :name => 'test-domain.org')
36 36 domain.valid?
37   - assert !domain.errors[:name.to_s].present?
  37 + assert !domain.errors[:name].present?
38 38 end
39 39  
40 40 should 'allow domains with underscore' do
41 41 domain = build(Domain, :name => 'test_domain.org')
42 42 domain.valid?
43   - assert !domain.errors[:name.to_s].present?
  43 + assert !domain.errors[:name].present?
44 44 end
45 45  
46 46 def test_owner
... ... @@ -59,11 +59,11 @@ class DomainTest &lt; ActiveSupport::TestCase
59 59 d = Domain.new
60 60 d.name = 'www.example.net'
61 61 d.valid?
62   - assert d.errors[:name.to_s].present?, "Name should not accept www."
  62 + assert d.errors[:name].present?, "Name should not accept www."
63 63  
64 64 d.name = 'example.net'
65 65 d.valid?
66   - assert !d.errors[:name.to_s].present?
  66 + assert !d.errors[:name].present?
67 67 end
68 68  
69 69 def test_find_by_name
... ... @@ -82,7 +82,7 @@ class DomainTest &lt; ActiveSupport::TestCase
82 82  
83 83 d = build(Domain, :name => 'example.net')
84 84 assert !d.valid?
85   - assert d.errors[:name.to_s].present?
  85 + assert d.errors[:name].present?
86 86 end
87 87  
88 88 def test_environment
... ...
test/unit/organization_mailing_test.rb
  Diff comments   View file @2cee8f5
... ... @@ -57,7 +57,7 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
57 57  
58 58 should 'return url for organization on url' do
59 59 mailing = build(OrganizationMailing, :source => community)
60   - assert_equal "#{community.environment.top_url}/#{community.name.to_slug}/", mailing.url
  60 + assert_equal "#{community.environment.top_url}/#{community.name.to_slug}", mailing.url
61 61 end
62 62  
63 63 should 'deliver mailing to each member after create' do
... ...
test/unit/person_notifier_test.rb
  Diff comments   View file @2cee8f5
1 1 require_relative "../test_helper"
2 2  
3 3 class PersonNotifierTest < ActiveSupport::TestCase
  4 +
4 5 FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
5 6 CHARSET = "utf-8"
6 7  
... ... @@ -19,7 +20,6 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
19 20 @community.add_member(@admin)
20 21 @article = fast_create(TextileArticle, :name => 'Article test', :profile_id => @community.id, :notify_comments => false)
21 22 Delayed::Job.delete_all
22   - notify
23 23 ActionMailer::Base.deliveries = []
24 24 end
25 25  
... ... @@ -157,28 +157,30 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
157 157 process_delayed_job_queue
158 158 notify
159 159 sent = ActionMailer::Base.deliveries.last
160   - assert_match /cannot render notification for some_invalid_verb/, sent.body.to_s
  160 + # don't raise erros
161 161 end
162 162  
163 163 ActionTrackerConfig.verb_names.each do |verb|
164 164 should "render notification for verb #{verb}" do
165   - action = mock()
166   - action.stubs(:verb).returns(verb)
167   - action.stubs(:user).returns(@member)
168   - action.stubs(:created_at).returns(DateTime.now)
169   - action.stubs(:target).returns(fast_create(Forum))
170   - action.stubs(:comments_count).returns(0)
171   - action.stubs(:comments).returns([])
172   - action.stubs(:params).returns({'name' => 'home', 'url' => '/', 'lead' => ''})
173   - action.stubs(:get_url).returns('')
174   -
175   - notifications = []
176   - notifications.stubs(:find).returns([action])
177   - Person.any_instance.stubs(:tracked_notifications).returns(notifications)
  165 + @member.tracked_notifications = []
  166 +
  167 + a = @member.tracked_notifications.build
  168 + a.verb = verb
  169 + a.user = @member
  170 + a.created_at = @member.notifier.notify_from + 1.day
  171 + a.target = fast_create(Forum)
  172 + a.comments_count = 0
  173 + a.params = {'view_url'=> {}, 'name' => 'home', 'url' => '/', 'lead' => ''}
  174 + a.get_url = ''
  175 + a.save!
  176 + n = @member.action_tracker_notifications.build
  177 + n.action_tracker = a
  178 + n.profile = @member
  179 + n.save!
178 180  
179 181 notify
180 182 sent = ActionMailer::Base.deliveries.last
181   - assert_no_match /cannot render notification for #{verb}/, sent.body.to_s
  183 + # assert not raised
182 184 end
183 185 end
184 186  
... ...
test/unit/product_test.rb
  Diff comments   View file @2cee8f5
... ... @@ -178,7 +178,7 @@ class ProductTest &lt; ActiveSupport::TestCase
178 178 product.valid?
179 179  
180 180 assert_no_match /[<>]/, product.name
181   - assert_no_match /[<>]/, product.description
  181 + assert_match /<h1>&gt;&gt; &gt;&gt; html &gt;<\/h1>/, product.description
182 182 end
183 183  
184 184 should 'use name of category when has no name yet' do
... ...
test/unit/profile_test.rb
  Diff comments   View file @2cee8f5
... ... @@ -457,7 +457,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
457 457 p1 = create(Profile, :public_profile => true)
458 458 p2 = create(Profile, :public_profile => true, :secret => true)
459 459  
460   - result = Profile.public
  460 + result = Profile.is_public
461 461 assert_includes result, p1
462 462 assert_not_includes result, p2
463 463 end
... ... @@ -921,6 +921,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
921 921  
922 922 should 'copy communities from person template' do
923 923 template = create_user('test_template').person
  924 + template.is_template = true
924 925 Environment.any_instance.stubs(:person_default_template).returns(template)
925 926  
926 927 c1 = fast_create(Community)
... ... @@ -1395,6 +1396,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
1395 1396 template = create_user('test_template').person
1396 1397 template.custom_footer = "footer customized"
1397 1398 template.custom_header = "header customized"
  1399 + template.is_template = true
1398 1400 Environment.any_instance.stubs(:person_default_template).returns(template)
1399 1401  
1400 1402 person = create_user_full('mytestuser').person
... ... @@ -1450,7 +1452,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
1450 1452 assert_equal [t2], environment.profiles.templates(t2)
1451 1453 end
1452 1454  
1453   - should 'not return a template when and invalid template is specified' do
  1455 + should 'not return a template when a non template is specified' do
1454 1456 environment = Environment.default
1455 1457 t1 = fast_create(Profile, :is_template => true)
1456 1458 t2 = fast_create(Profile, :is_template => true)
... ...
test/unit/tags_block_test.rb
  Diff comments   View file @2cee8f5
... ... @@ -38,10 +38,10 @@ class TagsBlockTest &lt; ActiveSupport::TestCase
38 38 box = create(Box, :owner => Environment.default)
39 39 @block = create(TagsBlock, :box => box)
40 40  
41   - assert_match /\/tag\/first-tag" [^>]+"3 items"/, block.content
42   - assert_match /\/tag\/second-tag" [^>]+"3 items"/, block.content
43   - assert_match /\/tag\/third-tag" [^>]+"one item"/, block.content
44   - assert_match /\/tag\/other-tag" [^>]+"2 items"/, block.content
  41 + assert_match /3 items[^>]+\/tag\/first-tag/, block.content
  42 + assert_match /3 items[^>]+\/tag\/second-tag/, block.content
  43 + assert_match /one item[^>]+\/tag\/third-tag/, block.content
  44 + assert_match /2 item[^>]+\/tag\/other-tag"/, block.content
45 45 end
46 46  
47 47 should 'return (none) when no tags to display' do
... ...
vendor/plugins/monkey_patches/attachment_fu/init.rb
  Diff comments   View file @2cee8f5
1 1 # Monkey patch to rewrite attachment_fu's logic where no image with parent can
2 2 # be thumbnailable.
3 3  
  4 +require_dependency 'technoweenie/attachment_fu'
  5 +
4 6 Technoweenie::AttachmentFu::InstanceMethods.module_eval do
5 7 def thumbnailable?
6 8 image? && !is_thumbnail?
... ... @@ -24,3 +26,34 @@ Technoweenie::AttachmentFu::Backends::FileSystemBackend.module_eval do
24 26 end
25 27 end
26 28  
  29 +# https://github.com/pothoven/attachment_fu/pull/14
  30 +# remove on 3.2.16
  31 +Technoweenie::AttachmentFu::InstanceMethods.module_eval do
  32 + # Creates or updates the thumbnail for the current attachment.
  33 + def create_or_update_thumbnail(temp_file, file_name_suffix, *size)
  34 + thumbnailable? || raise(ThumbnailError.new("Can't create a thumbnail if the content type is not an image or there is no parent_id column"))
  35 + find_or_initialize_thumbnail(file_name_suffix).tap do |thumb|
  36 + thumb.temp_paths.unshift temp_file
  37 + attributes = {
  38 + content_type: content_type,
  39 + filename: thumbnail_name_for(file_name_suffix),
  40 + thumbnail_resize_options: size
  41 + }
  42 + attributes.each{ |a, v| thumb.send "#{a}=", v }
  43 + callback_with_args :before_thumbnail_saved, thumb
  44 + thumb.save!
  45 + end
  46 + end
  47 +
  48 + # Initializes a new thumbnail with the given suffix.
  49 + def find_or_initialize_thumbnail(file_name_suffix)
  50 + attrs = {thumbnail: file_name_suffix.to_s}
  51 + attrs[:parent_id] = id if respond_to? :parent_id
  52 + thumb = thumbnail_class.where(attrs).first
  53 + unless thumb
  54 + thumb = thumbnail_class.new
  55 + attrs.each{ |a, v| thumb[a] = v }
  56 + end
  57 + thumb
  58 + end
  59 +end
... ...