diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb
index 2521d19..27b5ae4 100644
--- a/app/models/create_enterprise.rb
+++ b/app/models/create_enterprise.rb
@@ -22,7 +22,7 @@ class CreateEnterprise < Task
   #checks if the validation method is region to validates
   validates_presence_of :region_id, :if => lambda { |obj| obj.environment.organization_approval_method == :region }
 
-  validates_format_of :foundation_year, :with => /\d*/
+  validates_numericality_of :foundation_year, only_integer: true
 
   # checks for actual attributes
   validates_presence_of :requestor_id, :target_id
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 3595708..f368c5c 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -14,7 +14,7 @@ class Domain < ActiveRecord::Base
 
   # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
   # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
-  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
+  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
 
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
diff --git a/app/models/image.rb b/app/models/image.rb
index 01df1e6..eb1e35f 100644
--- a/app/models/image.rb
+++ b/app/models/image.rb
@@ -1,5 +1,7 @@
 class Image < ActiveRecord::Base
 
+  attr_accessible :uploaded_data, :label
+
   def self.max_size
     Image.attachment_options[:max_size]
   end
@@ -24,8 +26,6 @@ class Image < ActiveRecord::Base
 
   postgresql_attachment_fu
 
-  attr_accessible :uploaded_data, :label
-
   def current_data
     File.file?(full_filename) ? File.read(full_filename) : nil
   end
diff --git a/app/models/person_notifier.rb b/app/models/person_notifier.rb
index c2f672e..10825f0 100644
--- a/app/models/person_notifier.rb
+++ b/app/models/person_notifier.rb
@@ -1,3 +1,6 @@
+# FIXME needed by test/units/application_helper.rb
+require_dependency 'application_helper'
+
 class PersonNotifier
 
   def initialize(person)
@@ -76,7 +79,7 @@ class PersonNotifier
 
   class Mailer < ActionMailer::Base
 
-    add_template_helper(ApplicationHelper)
+    helper ApplicationHelper
 
     def session
       {:theme => nil}
@@ -93,7 +96,7 @@ class PersonNotifier
       @recipient = @profile.nickname || @profile.name
       @notifications = notifications
       @tasks = tasks
-      @environment = @profile.environment.name
+      @environment = @profile.environment
       @url = @profile.environment.top_url
       mail(
         content_type: "text/html",
diff --git a/app/models/profile.rb b/app/models/profile.rb
index a04712d..8cb5c96 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -98,7 +98,9 @@ class Profile < ActiveRecord::Base
     where((Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
   }
   scope :templates, -> (template_id = nil) {
-    if template_id then where id: template_id else where is_template: true end
+    s = where is_template: true
+    s = s.where id: template_id if template_id
+    s
   }
 
   scope :with_templates, -> (templates) {
diff --git a/app/views/person_notifier/mailer/content_summary.html.erb b/app/views/person_notifier/mailer/content_summary.html.erb
index a999348..153674d 100644
--- a/app/views/person_notifier/mailer/content_summary.html.erb
+++ b/app/views/person_notifier/mailer/content_summary.html.erb
@@ -25,7 +25,7 @@
           <% @notifications.each do |activity| %>
               <div style="border-bottom:1px solid #e2e2e2;padding:15px 0;width:600px">
               <table style="width:100%;">
-                <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %>
+                <%= render activity.verb, activity: activity %>
               </table>
             </div>
           <% end %>
diff --git a/config/initializers/dependencies.rb b/config/initializers/dependencies.rb
index 83f4c31..cbdd65d 100644
--- a/config/initializers/dependencies.rb
+++ b/config/initializers/dependencies.rb
@@ -6,7 +6,7 @@ require 'will_paginate/array'
 require 'nokogiri'
 
 # dependencies at vendor, firstly loaded on Gemfile
-vendor = (Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins'])
+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
 vendor.each do |dir|
   init_rb = "#{Rails.root}/#{dir}/init.rb"
   require init_rb if File.file? init_rb
@@ -24,3 +24,4 @@ require 'set_profile_region_from_city_state'
 require 'authenticated_system'
 require 'needs_profile'
 require 'white_list_filter'
+
diff --git a/lib/noosfero/core_ext/array.rb b/lib/noosfero/core_ext/array.rb
deleted file mode 100644
index 0b928ae..0000000
--- a/lib/noosfero/core_ext/array.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Array
-
-  def uniq_by
-    hash, array = {}, []
-    each { |i| hash[yield(i)] ||= (array << i) }
-    array
-  end
-
-end
diff --git a/test/unit/array_core_ext_test.rb b/test/unit/array_core_ext_test.rb
deleted file mode 100644
index 87c4eab..0000000
--- a/test/unit/array_core_ext_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative "../test_helper"
-
-# tests for Array core extension. See lib/noosfero/core_ext/array.rb
-class StringCoreExtTest < ActiveSupport::TestCase
-
-  should 'allow uniq by a block' do
-    array = [0,1,2,3,4,5,6]
-    assert_equal [0,1], array.uniq_by {|number| number%2 }
-  end
-
-end
diff --git a/test/unit/block_test.rb b/test/unit/block_test.rb
index b44a481..b50bc74 100644
--- a/test/unit/block_test.rb
+++ b/test/unit/block_test.rb
@@ -248,7 +248,8 @@ class BlockTest < ActiveSupport::TestCase
   should 'generate embed code' do
     b = Block.new
     b.stubs(:url_for).returns('http://myblogtest.com/embed/block/1')
-    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
+    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
   end
 
   should 'default value for display_user is all' do
diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb
index b028e04..5d1ed4a 100644
--- a/test/unit/create_enterprise_test.rb
+++ b/test/unit/create_enterprise_test.rb
@@ -15,18 +15,18 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
       assert task.respond_to?("#{field}=")
     end
   end
-  
+
   should 'accept only numbers as foundation year' do
     task = CreateEnterprise.new
     task.stubs(:environment).returns(Environment.default)
 
     task.foundation_year = "test"
     task.valid?
-    assert task.errors[:foundation_year.to_s].present?
+    assert task.errors[:foundation_year].present?
 
     task.foundation_year = 2006
     task.valid?
-    assert !task.errors[:foundation_year.to_s].present?
+    assert !task.errors[:foundation_year].present?
   end
 
   should 'require a requestor' do
@@ -65,7 +65,7 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
 
     task.valid?
     assert task.errors[:target.to_s].present?
-    
+
     region.validators << validator
 
     task.valid?
diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb
index 455927f..066e9b6 100644
--- a/test/unit/domain_test.rb
+++ b/test/unit/domain_test.rb
@@ -10,37 +10,37 @@ class DomainTest < ActiveSupport::TestCase
   should 'not allow domains without name' do
     domain = Domain.new
     domain.valid?
-    assert domain.errors[:name.to_s].present?
+    assert domain.errors[:name].present?
   end
 
   should 'not allow domain without dot' do
     domain = build(Domain, :name => 'test')
     domain.valid?
-    assert domain.errors[:name.to_s].present?
+    assert domain.errors[:name].present?
   end
 
   should 'allow domains with dot' do
     domain = build(Domain, :name => 'test.org')
     domain.valid?
-    assert !domain.errors[:name.to_s].present?
+    assert !domain.errors[:name].present?
   end
 
   should 'not allow domains with upper cased letters' do
     domain = build(Domain, :name => 'tEst.org')
     domain.valid?
-    assert domain.errors[:name.to_s].present?
+    assert domain.errors[:name].present?
   end
 
   should 'allow domains with hyphen' do
     domain = build(Domain, :name => 'test-domain.org')
     domain.valid?
-    assert !domain.errors[:name.to_s].present?
+    assert !domain.errors[:name].present?
   end
 
   should 'allow domains with underscore' do
     domain = build(Domain, :name => 'test_domain.org')
     domain.valid?
-    assert !domain.errors[:name.to_s].present?
+    assert !domain.errors[:name].present?
   end
 
   def test_owner
@@ -59,11 +59,11 @@ class DomainTest < ActiveSupport::TestCase
     d = Domain.new
     d.name = 'www.example.net'
     d.valid?
-    assert d.errors[:name.to_s].present?, "Name should not accept www."
+    assert d.errors[:name].present?, "Name should not accept www."
 
     d.name = 'example.net'
     d.valid?
-    assert !d.errors[:name.to_s].present?
+    assert !d.errors[:name].present?
   end
 
   def test_find_by_name
@@ -82,7 +82,7 @@ class DomainTest < ActiveSupport::TestCase
 
     d = build(Domain, :name => 'example.net')
     assert !d.valid?
-    assert d.errors[:name.to_s].present?
+    assert d.errors[:name].present?
   end
 
   def test_environment
diff --git a/test/unit/organization_mailing_test.rb b/test/unit/organization_mailing_test.rb
index 674b144..f8e2b94 100644
--- a/test/unit/organization_mailing_test.rb
+++ b/test/unit/organization_mailing_test.rb
@@ -57,7 +57,7 @@ class OrganizationMailingTest < ActiveSupport::TestCase
 
   should 'return url for organization on url' do
     mailing = build(OrganizationMailing, :source => community)
-    assert_equal "#{community.environment.top_url}/#{community.name.to_slug}/", mailing.url
+    assert_equal "#{community.environment.top_url}/#{community.name.to_slug}", mailing.url
   end
 
   should 'deliver mailing to each member after create' do
diff --git a/test/unit/person_notifier_test.rb b/test/unit/person_notifier_test.rb
index 59c93b4..3827a80 100644
--- a/test/unit/person_notifier_test.rb
+++ b/test/unit/person_notifier_test.rb
@@ -1,6 +1,7 @@
 require_relative "../test_helper"
 
 class PersonNotifierTest < ActiveSupport::TestCase
+
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
   CHARSET = "utf-8"
 
@@ -19,7 +20,6 @@ class PersonNotifierTest < ActiveSupport::TestCase
     @community.add_member(@admin)
     @article = fast_create(TextileArticle, :name => 'Article test', :profile_id => @community.id, :notify_comments => false)
     Delayed::Job.delete_all
-    notify
     ActionMailer::Base.deliveries = []
   end
 
@@ -157,28 +157,30 @@ class PersonNotifierTest < ActiveSupport::TestCase
     process_delayed_job_queue
     notify
     sent = ActionMailer::Base.deliveries.last
-    assert_match /cannot render notification for some_invalid_verb/, sent.body.to_s
+    # don't raise erros
   end
 
   ActionTrackerConfig.verb_names.each do |verb|
     should "render notification for verb #{verb}" do
-      action = mock()
-      action.stubs(:verb).returns(verb)
-      action.stubs(:user).returns(@member)
-      action.stubs(:created_at).returns(DateTime.now)
-      action.stubs(:target).returns(fast_create(Forum))
-      action.stubs(:comments_count).returns(0)
-      action.stubs(:comments).returns([])
-      action.stubs(:params).returns({'name' => 'home', 'url' => '/', 'lead' => ''})
-      action.stubs(:get_url).returns('')
-
-      notifications = []
-      notifications.stubs(:find).returns([action])
-      Person.any_instance.stubs(:tracked_notifications).returns(notifications)
+      @member.tracked_notifications = []
+
+      a = @member.tracked_notifications.build
+      a.verb = verb
+      a.user = @member
+      a.created_at = @member.notifier.notify_from + 1.day
+      a.target = fast_create(Forum)
+      a.comments_count = 0
+      a.params = {'view_url'=> {}, 'name' => 'home', 'url' => '/', 'lead' => ''}
+      a.get_url = ''
+      a.save!
+      n = @member.action_tracker_notifications.build
+      n.action_tracker = a
+      n.profile = @member
+      n.save!
 
       notify
       sent = ActionMailer::Base.deliveries.last
-      assert_no_match /cannot render notification for #{verb}/, sent.body.to_s
+      # assert not raised
     end
   end
 
diff --git a/test/unit/product_test.rb b/test/unit/product_test.rb
index afd5de9..6989af1 100644
--- a/test/unit/product_test.rb
+++ b/test/unit/product_test.rb
@@ -178,7 +178,7 @@ class ProductTest < ActiveSupport::TestCase
     product.valid?
 
     assert_no_match /[<>]/, product.name
-    assert_no_match /[<>]/, product.description
+    assert_match /<h1>&gt;&gt; &gt;&gt; html &gt;<\/h1>/, product.description
   end
 
   should 'use name of category when has no name yet' do
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 7a02210..68e405d 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -457,7 +457,7 @@ class ProfileTest < ActiveSupport::TestCase
     p1 = create(Profile, :public_profile => true)
     p2 = create(Profile, :public_profile => true, :secret => true)
 
-    result = Profile.public
+    result = Profile.is_public
     assert_includes result, p1
     assert_not_includes result, p2
   end
@@ -921,6 +921,7 @@ class ProfileTest < ActiveSupport::TestCase
 
   should 'copy communities from person template' do
     template = create_user('test_template').person
+    template.is_template = true
     Environment.any_instance.stubs(:person_default_template).returns(template)
 
     c1 = fast_create(Community)
@@ -1395,6 +1396,7 @@ class ProfileTest < ActiveSupport::TestCase
     template = create_user('test_template').person
     template.custom_footer = "footer customized"
     template.custom_header = "header customized"
+    template.is_template = true
     Environment.any_instance.stubs(:person_default_template).returns(template)
 
     person = create_user_full('mytestuser').person
@@ -1450,7 +1452,7 @@ class ProfileTest < ActiveSupport::TestCase
     assert_equal [t2], environment.profiles.templates(t2)
   end
 
-  should 'not return a template when and invalid template is specified' do
+  should 'not return a template when a non template is specified' do
     environment = Environment.default
     t1 = fast_create(Profile, :is_template => true)
     t2 = fast_create(Profile, :is_template => true)
diff --git a/test/unit/tags_block_test.rb b/test/unit/tags_block_test.rb
index 1d6e204..fe8d874 100644
--- a/test/unit/tags_block_test.rb
+++ b/test/unit/tags_block_test.rb
@@ -38,10 +38,10 @@ class TagsBlockTest < ActiveSupport::TestCase
     box = create(Box, :owner => Environment.default)
     @block = create(TagsBlock, :box => box)
 
-    assert_match /\/tag\/first-tag" [^>]+"3 items"/,  block.content
-    assert_match /\/tag\/second-tag" [^>]+"3 items"/, block.content
-    assert_match /\/tag\/third-tag" [^>]+"one item"/, block.content
-    assert_match /\/tag\/other-tag" [^>]+"2 items"/,  block.content
+    assert_match /3 items[^>]+\/tag\/first-tag/,  block.content
+    assert_match /3 items[^>]+\/tag\/second-tag/, block.content
+    assert_match /one item[^>]+\/tag\/third-tag/, block.content
+    assert_match /2 item[^>]+\/tag\/other-tag"/,  block.content
   end
 
   should 'return (none) when no tags to display' do
diff --git a/vendor/plugins/monkey_patches/attachment_fu/init.rb b/vendor/plugins/monkey_patches/attachment_fu/init.rb
index 1edbc9e..212d6aa 100644
--- a/vendor/plugins/monkey_patches/attachment_fu/init.rb
+++ b/vendor/plugins/monkey_patches/attachment_fu/init.rb
@@ -1,6 +1,8 @@
 # Monkey patch to rewrite attachment_fu's logic where no image with parent can
 # be thumbnailable.
 
+require_dependency 'technoweenie/attachment_fu'
+
 Technoweenie::AttachmentFu::InstanceMethods.module_eval do
   def thumbnailable?
     image? && !is_thumbnail?
@@ -24,3 +26,34 @@ Technoweenie::AttachmentFu::Backends::FileSystemBackend.module_eval do
   end
 end
 
+# https://github.com/pothoven/attachment_fu/pull/14
+# remove on 3.2.16
+Technoweenie::AttachmentFu::InstanceMethods.module_eval do
+  # Creates or updates the thumbnail for the current attachment.
+  def create_or_update_thumbnail(temp_file, file_name_suffix, *size)
+    thumbnailable? || raise(ThumbnailError.new("Can't create a thumbnail if the content type is not an image or there is no parent_id column"))
+    find_or_initialize_thumbnail(file_name_suffix).tap do |thumb|
+      thumb.temp_paths.unshift temp_file
+      attributes = {
+        content_type:             content_type,
+        filename:                 thumbnail_name_for(file_name_suffix),
+        thumbnail_resize_options: size
+      }
+      attributes.each{ |a, v| thumb.send "#{a}=", v }
+      callback_with_args :before_thumbnail_saved, thumb
+      thumb.save!
+    end
+  end
+
+  # Initializes a new thumbnail with the given suffix.
+  def find_or_initialize_thumbnail(file_name_suffix)
+    attrs = {thumbnail: file_name_suffix.to_s}
+    attrs[:parent_id] = id if respond_to? :parent_id
+    thumb = thumbnail_class.where(attrs).first
+    unless thumb
+      thumb = thumbnail_class.new
+      attrs.each{ |a, v| thumb[a] = v }
+    end
+    thumb
+  end
+end
--
libgit2 0.21.2