diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index 7288e07..fb2e0e1 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -6,7 +6,7 @@ class CmsController < MyProfileController
 
   def search_tags
     arg = params[:term].downcase
-    result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
+    result = Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
     render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
 
diff --git a/app/models/approve_comment.rb b/app/models/approve_comment.rb
index 035f2dc..cadf357 100644
--- a/app/models/approve_comment.rb
+++ b/app/models/approve_comment.rb
@@ -8,7 +8,7 @@ class ApproveComment < Task
   def comment
     unless @comment || self.comment_attributes.nil?
       @comment = Comment.new
-      @comment.assign_attributes(ActiveSupport::JSON.decode(self.comment_attributes), :without_protection => true)
+      @comment.assign_attributes(ActiveSupport::JSON.decode(self.comment_attributes.to_s), :without_protection => true)
     end
     @comment
   end
diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb
index 27b5ae4..18a2f1f 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_numericality_of :foundation_year, only_integer: true
+  validates_numericality_of :foundation_year, only_integer: true, allow_nil: true
 
   # checks for actual attributes
   validates_presence_of :requestor_id, :target_id
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 2b24b14..fe6eac1 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -112,7 +112,7 @@ class Organization < Profile
 
   settings_items :zip_code, :city, :state, :country
 
-  validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
+  validates_numericality_of :foundation_year, only_integer: true, allow_nil: true
   validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
   validates_as_cnpj :cnpj
 
diff --git a/app/models/profile_suggestion.rb b/app/models/profile_suggestion.rb
index e60a608..54e7b41 100644
--- a/app/models/profile_suggestion.rb
+++ b/app/models/profile_suggestion.rb
@@ -55,13 +55,13 @@ class ProfileSuggestion < ActiveRecord::Base
       :threshold => 2, :weight => 1, :connection => 'Profile'
     },
     :people_with_common_tags => {
-      :threshold => 2, :weight => 1, :connection => 'ActsAsTaggableOn::Tag'
+      :threshold => 2, :weight => 1, :connection => 'Tag'
     },
     :communities_with_common_friends => {
       :threshold => 2, :weight => 1, :connection => 'Profile'
     },
     :communities_with_common_tags => {
-      :threshold => 2, :weight => 1, :connection => 'ActsAsTaggableOn::Tag'
+      :threshold => 2, :weight => 1, :connection => 'Tag'
     }
   }
 
@@ -127,17 +127,15 @@ class ProfileSuggestion < ActiveRecord::Base
         rescue NoMethodError
           next
         end
-        connections = suggested_profile.send("#{rule}_connections")
-        if connections.present?
-          connections = connections[1..-2].split(',')
-        else
-          connections = []
-        end
-        suggestion.send("#{rule}=", value)
+
+        connections = suggested_profile.send("#{rule}_connections") || []
+        connections = connections[1..-2] if connections.present?
         connections.each do |connection_id|
           next if SuggestionConnection.where(:suggestion_id => suggestion.id, :connection_id => connection_id, :connection_type => options[:connection]).present?
           SuggestionConnection.create!(:suggestion => suggestion, :connection_id => connection_id, :connection_type => options[:connection])
         end
+
+        suggestion.send("#{rule}=", value)
         suggestion.score += value * options[:weight]
       end
       suggestion.save!
diff --git a/app/models/tag.rb b/app/models/tag.rb
new file mode 100644
index 0000000..53e53fd
--- /dev/null
+++ b/app/models/tag.rb
@@ -0,0 +1,34 @@
+Tag = ActsAsTaggableOn::Tag
+class Tag
+
+  attr_accessible :name, :parent_id, :pending
+
+  has_many :children, class_name: 'Tag', foreign_key: 'parent_id', dependent: :destroy
+
+  @@original_find = self.method(:find)
+  # Rename the find method to find_with_pendings that includes all tags in the search regardless if its pending or not
+  def self.find_with_pendings(*args)
+    @@original_find.call(*args)
+  end
+
+  # Redefine the find method to exclude the pending tags from the search not allowing to tag something with an unapproved tag
+  def self.find(*args)
+    self.where(pending: false).find_with_pendings(*args)
+  end
+
+  # Return all the tags that were suggested but not yet approved
+  def self.find_pendings
+    self.where(pending: true)
+  end
+
+  # All the tags that can be a new parent for this tag, that is all but itself and its descendents to avoid loops
+  def parent_candidates
+    ActsAsTaggableOn::Tag.all - descendents - [self]
+  end
+
+  # All tags that have this tag as its one of its ancestors
+  def descendents
+    children.to_a.sum([], &:descendents) + children
+  end
+
+end
diff --git a/lib/acts_as_having_settings.rb b/lib/acts_as_having_settings.rb
index 20fc92e..54434fe 100644
--- a/lib/acts_as_having_settings.rb
+++ b/lib/acts_as_having_settings.rb
@@ -21,6 +21,12 @@ end
 
 module ActsAsHavingSettings
 
+  def self.type_cast value, type
+    # do not cast nil
+    return value if value.nil?
+    type.send :cast_value, value
+  end
+
   module ClassMethods
 
     def acts_as_having_settings(*args)
@@ -50,13 +56,12 @@ module ActsAsHavingSettings
       settings_items *args
     end
 
-    def settings_items(*names)
+    def settings_items *names
 
-      options = names.last.is_a?(Hash) ? names.pop : {}
-      default = if !options[:default].nil? then options[:default] else nil end
-      data_type = options[:type]
-      data_type = if data_type.present? then data_type.to_s.camelize.to_sym else :String end
-      data_type = ActiveRecord::Type.const_get(data_type).new
+      options = names.extract_options!
+      default = options[:default]
+      type = options[:type]
+      type = if type.present? then ActiveRecord::Type.const_get(type.to_s.camelize.to_sym).new else nil end
 
       names.each do |setting|
         # symbolize key
@@ -65,19 +70,17 @@ module ActsAsHavingSettings
         define_method setting do
           h = send self.class.settings_field
           val = h[setting]
-          if val.nil? then (if default.is_a? String then gettext default else default end) else val end
+          # translate default value if it is used
+          if not val.nil? then val elsif default.is_a? String then gettext default else default end
         end
+
         define_method "#{setting}=" do |value|
           h = send self.class.settings_field
-          h[setting] = self.class.acts_as_having_settings_type_cast value, data_type
+          h[setting] = if type then ActsAsHavingSettings.type_cast value, type else value end
         end
       end
     end
 
-    def acts_as_having_settings_type_cast value, type
-      type.send :cast_value, value
-    end
-
   end
 
 end
diff --git a/lib/extended_tag.rb b/lib/extended_tag.rb
deleted file mode 100644
index dc9c316..0000000
--- a/lib/extended_tag.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class ActsAsTaggableOn::Tag
-
-  attr_accessible :name, :parent_id, :pending
-
-  has_many :children, :class_name => 'Tag', :foreign_key => 'parent_id', :dependent => :destroy
-
-
-  @@original_find = self.method(:find)
-  # Rename the find method to find_with_pendings that includes all tags in the search regardless if its pending or not
-  def self.find_with_pendings(*args)
-      @@original_find.call(*args)
-  end
-
-  # Redefine the find method to exclude the pending tags from the search not allowing to tag something with an unapproved tag
-  def self.find(*args)
-    self.with_scope(:find => { :conditions => ['pending = ?', false] }) do
-      self.find_with_pendings(*args)
-    end
-  end
-
-  # Return all the tags that were suggested but not yet approved
-  def self.find_pendings
-    self.find_with_pendings.where('pending = ?', true)
-  end
-
-  # All the tags that can be a new parent for this tag, that is all but itself and its descendents to avoid loops
-  def parent_candidates
-    ActsAsTaggableOn::Tag.all - descendents - [self]
-  end
-
-  # All tags that have this tag as its one of its ancestors
-  def descendents
-    children.to_a.sum([], &:descendents) + children
-  end
-
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7f00b13..ca7724b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -139,6 +139,7 @@ class ActiveSupport::TestCase
     assert !text.index('<'), "Text '#{text}' expected to be sanitized"
   end
 
+  # TODO: HTML::Document is deprecated, port to Nokogiri::HTML
   def assert_tag_in_string(text, options)
     doc = HTML::Document.new(text, false, false)
     tag = doc.find(options)
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 87ae564..fb54c8a 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -886,7 +886,7 @@ class ArticleTest < ActiveSupport::TestCase
 
   should 'sanitize tags after save article' do
     article = fast_create(Article, :slug => 'article-with-tags', :profile_id => profile.id)
-    tag = build(ActsAsTaggableOn::Tag, :name => "TV Web w<script type='javascript'></script>")
+    tag = build(Tag, name: "TV Web w<script type='javascript'></script>")
     assert_match /[<>]/, tag.name
     article.tag_list.add(tag.name)
     article.save!
@@ -895,7 +895,7 @@ class ArticleTest < ActiveSupport::TestCase
 
   should 'strip HTML from tag names after save article' do
     article = fast_create(Article, :slug => 'article-with-tags', :profile_id => profile.id)
-    tag = build(ActsAsTaggableOn::Tag, :name => "TV Web w<script type=...")
+    tag = build(Tag, name: "TV Web w<script type=...")
     assert_match /</, tag.name
     article.tag_list.add(tag.name)
     article.save!
diff --git a/test/unit/block_test.rb b/test/unit/block_test.rb
index b50bc74..a92e392 100644
--- a/test/unit/block_test.rb
+++ b/test/unit/block_test.rb
@@ -248,7 +248,7 @@ 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>",
+    assert_equal "<iframe src=\"http://myblogtest.com/embed/block/1\" frameborder=\"0\" width=\"1024\" height=\"768\" class=\"embed block block\"></iframe>",
       b.embed_code.call
   end
 
diff --git a/test/unit/blog_helper_test.rb b/test/unit/blog_helper_test.rb
index 474703b..5cba495 100644
--- a/test/unit/blog_helper_test.rb
+++ b/test/unit/blog_helper_test.rb
@@ -41,7 +41,7 @@ class BlogHelperTest < ActionView::TestCase
       "<#{tag}#{options.map{|k,v| " #{k}=\"#{[v].flatten.join(' ')}\""}.join}>#{content}</#{tag}>"
     end
 
-    html = HTML::Document.new(list_posts(blog.posts)).root
+    html = Nokogiri::HTML list_posts(blog.posts)
     assert_select html, "div#post-#{newer_post.id}.blog-post.position-1.first.odd-post" +
                         " > div.odd-post-inner.blog-post-inner > .title", 'Last post'
     assert_select html, "div#post-#{hidden_post.id}.blog-post.position-2.not-published.even-post" +
diff --git a/test/unit/catalog_helper_test.rb b/test/unit/catalog_helper_test.rb
index 6aef0a8..65b52c2 100644
--- a/test/unit/catalog_helper_test.rb
+++ b/test/unit/catalog_helper_test.rb
@@ -6,12 +6,7 @@ class CatalogHelperTest < ActiveSupport::TestCase
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
-
   include ::Rails::Dom::Testing::Assertions::SelectorAssertions
-  # see http://blog.cynthiakiser.com/blog/2014/12/26/upgrading-from-rails-4-dot-1-8-to-4-dot-2-0/
-  def document_root_element
-    @doc.root
-  end
 
   def url_for(opts)
     #{:controller => 'catalog', :action => 'index', :level => category.id}
@@ -49,8 +44,8 @@ class CatalogHelperTest < ActiveSupport::TestCase
 
     html = category_with_sub_list @products
 
-    @doc = doc = HTML::Document.new "<body>#{html}</body>"
-    assert_select doc.root, 'div' do |divs|
+    doc = Nokogiri::HTML "<body>#{html}</body>"
+    assert_select doc, 'div' do |divs|
       assert_select divs[0], "a[href=catalog-index-level=#{@products.id}]"
       assert_select divs[0], '.count', {:text=>'3'}
       assert_select divs[1], "a[href=catalog-index-level=#{@food.id}]"
diff --git a/test/unit/display_helper_test.rb b/test/unit/display_helper_test.rb
index 4936280..a64628a 100644
--- a/test/unit/display_helper_test.rb
+++ b/test/unit/display_helper_test.rb
@@ -36,12 +36,12 @@ class DisplayHelperTest < ActiveSupport::TestCase
 
   should 'linkify "http://" prepended words on txt2html' do
     html = txt2html "go to http://noosfero.org"
-    assert_equal 'go to <a href="http://noosfero.org" onclick="return confirm(\'Are you sure you want to visit this web site?\')" rel="nofolow" target="_blank">noos&#x200B;fero&#x200B;.org</a>', html
+    assert_equal "go to <a href=\"http://noosfero.org\" target=\"_blank\" rel=\"nofolow\" onclick=\"return confirm('Are you sure you want to visit this web site?')\">noos&#x200B;fero&#x200B;.org</a>", html
   end
 
   should 'linkify "www." prepended words on txt2html' do
     html = txt2html "go to www.noosfero.org yeah!"
-    assert_equal 'go to <a href="http://www.noosfero.org" onclick="return confirm(\'Are you sure you want to visit this web site?\')" rel="nofolow" target="_blank">www.&#x200B;noos&#x200B;fero&#x200B;.org</a> yeah!', html
+    assert_equal "go to <a href=\"http://www.noosfero.org\" target=\"_blank\" rel=\"nofolow\" onclick=\"return confirm('Are you sure you want to visit this web site?')\">www.&#x200B;noos&#x200B;fero&#x200B;.org</a> yeah!", html
   end
 
   should 'return path to file under theme dir if theme has that file' do
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 2bf75c6..2d65eeb 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -1145,7 +1145,7 @@ class EnvironmentTest < ActiveSupport::TestCase
     environment.message_for_disabled_enterprise = "<h1> Disabled Enterprise /h1>"
     environment.valid?
 
-    assert_no_match /[<>]/, environment.message_for_disabled_enterprise
+    assert_match /<h1> Disabled Enterprise \/h1&gt;<\/h1>/, environment.message_for_disabled_enterprise
   end
 
   should 'not sanitize html comments' do
@@ -1153,7 +1153,7 @@ class EnvironmentTest < ActiveSupport::TestCase
     environment.message_for_disabled_enterprise = '<p><!-- <asdf> << aasdfa >>> --> <h1> Wellformed html code </h1>'
     environment.valid?
 
-    assert_match  /<!-- .* --> <h1> Wellformed html code <\/h1>/, environment.message_for_disabled_enterprise
+    assert_match  /<p><!-- .* --> <\/p><h1> Wellformed html code <\/h1>/, environment.message_for_disabled_enterprise
   end
 
   should "not crash when set nil as terms of use" do
@@ -1386,11 +1386,12 @@ class EnvironmentTest < ActiveSupport::TestCase
   end
 
   should 'always store setting keys as symbol' do
+    Environment.settings_items :string_key, type: String
     env = Environment.default
-    env.settings['string_key'] = 'new value'
+    env.string_key = 'new value'
     env.save!; env.reload
-    assert_nil env.settings['string_key']
     assert_equal env.settings[:string_key], 'new value'
+    assert_nil env.settings['string_key']
   end
 
   should 'validate reports_lower_bound' do
diff --git a/test/unit/extended_tag_test.rb b/test/unit/extended_tag_test.rb
deleted file mode 100644
index a4fec02..0000000
--- a/test/unit/extended_tag_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require_relative "../test_helper"
-require 'extended_tag.rb'
-
-class UserTest < ActiveSupport::TestCase
-
-  def test_find_without_pendings
-    tag1 = ActsAsTaggableOn::Tag.create(:name => 'pending_tag', :pending => true)
-    tag2 = ActsAsTaggableOn::Tag.create(:name => 'approved_tag', :pending => false)
-    assert_nothing_raised {ActsAsTaggableOn::Tag.find(tag2.id)}
-    assert_raise(ActiveRecord::RecordNotFound) {ActsAsTaggableOn::Tag.find(tag1.id)}
-  end
-
-  def test_find_pendings
-    tag1 = ActsAsTaggableOn::Tag.create(:name => 'pending_tag', :pending => true)
-    tag2 = ActsAsTaggableOn::Tag.create(:name => 'approved_tag', :pending => false)
-    assert ActsAsTaggableOn::Tag.find_pendings.include?(tag1)
-    assert (not ActsAsTaggableOn::Tag.find_pendings.include?(tag2)) 
-  end
-
-  def test_parent_candidates
-    tag1 = ActsAsTaggableOn::Tag.create(:name => 'parent_tag')
-    tag2 = ActsAsTaggableOn::Tag.create(:name => 'child_tag', :parent_id => tag1.id)
-    assert ( not tag1.parent_candidates.include?(tag2) )
-    assert tag2.parent_candidates.include?(tag1)
-  end
-
-  def test_descendents
-    tag1 = ActsAsTaggableOn::Tag.create(:name => 'parent_tag')
-    tag2 = ActsAsTaggableOn::Tag.create(:name => 'child_tag', :parent_id => tag1.id)
-    tag3 = ActsAsTaggableOn::Tag.create(:name => 'grand_tag', :parent_id => tag2.id)
-    assert (not tag2.descendents.include?(tag1))
-    assert (not tag1.descendents.include?(tag1))
-    assert tag1.descendents.include?(tag2)
-    assert tag1.descendents.include?(tag3)
-  end
-
-end
diff --git a/test/unit/language_helper_test.rb b/test/unit/language_helper_test.rb
index 1d0291f..bc38a33 100644
--- a/test/unit/language_helper_test.rb
+++ b/test/unit/language_helper_test.rb
@@ -53,7 +53,7 @@ class LanguageHelperTest < ActiveSupport::TestCase
 
     self.expects(:language).returns('en')
     result = self.language_chooser(environment, :element => 'dropdown')
-    assert_match /<option value="en" selected="selected">English<\/option>/, result
+    assert_match /<option selected="selected" value="en">English<\/option>/, result
     assert_match /<option value="pt_BR">Português Brasileiro<\/option>/, result
     assert_match /<option value="fr">Français<\/option>/, result
     assert_match /<option value="it">Italiano<\/option>/, result
diff --git a/test/unit/person_notifier_test.rb b/test/unit/person_notifier_test.rb
index 3827a80..b8ecdc8 100644
--- a/test/unit/person_notifier_test.rb
+++ b/test/unit/person_notifier_test.rb
@@ -67,8 +67,11 @@ class PersonNotifierTest < ActiveSupport::TestCase
 
   should 'update last notification date' do
     Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
-    @community.add_member(@member)
+    notify
     initial_notification = @member.last_notification
+
+    Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
+    @community.add_member(@member)
     notify
     assert @member.last_notification > initial_notification
   end
@@ -150,14 +153,14 @@ class PersonNotifierTest < ActiveSupport::TestCase
     assert job.run_at < time + (@member.notification_time+1).hours
   end
 
-  should 'display error message if fail to render a notificiation' do
+  should 'fail to render an invalid notificiation' do
     @community.add_member(@member)
     Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article)
     ActionTracker::Record.any_instance.stubs(:verb).returns("some_invalid_verb")
     process_delayed_job_queue
-    notify
-    sent = ActionMailer::Base.deliveries.last
-    # don't raise erros
+    assert_raise do
+      notify
+    end
   end
 
   ActionTrackerConfig.verb_names.each do |verb|
@@ -170,7 +173,13 @@ class PersonNotifierTest < ActiveSupport::TestCase
       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.params = {
+        'name' => 'home', 'url' => '/', 'lead' => '',
+        'receiver_url' => '/', 'content' => 'nothing',
+        'friend_url' => '/', 'friend_profile_custom_icon' => [], 'friend_name' => ['joe'],
+        'resource_name' => ['resource'], 'resource_profile_custom_icon' => [], 'resource_url' => ['/'],
+        'view_url'=> ['/'], 'thumbnail_path' => ['1'],
+      }
       a.get_url = ''
       a.save!
       n = @member.action_tracker_notifications.build
@@ -178,9 +187,9 @@ class PersonNotifierTest < ActiveSupport::TestCase
       n.profile = @member
       n.save!
 
-      notify
-      sent = ActionMailer::Base.deliveries.last
-      # assert not raised
+      assert_nothing_raised do
+        notify
+      end
     end
   end
 
diff --git a/test/unit/product_category_test.rb b/test/unit/product_category_test.rb
index b5bb8a8..406b9c6 100644
--- a/test/unit/product_category_test.rb
+++ b/test/unit/product_category_test.rb
@@ -64,7 +64,6 @@ class ProductCategoryTest < ActiveSupport::TestCase
 
     scope = ProductCategory.by_environment(alt_environment)
 
-    assert_equal ActiveRecord::Relation, scope.class
     assert_equivalent [c2], scope
     assert_equivalent [c1,c3], ProductCategory.by_environment(Environment.default)
   end
diff --git a/test/unit/profile_suggestions_job_test.rb b/test/unit/profile_suggestions_job_test.rb
index fffa9dc..3376c57 100644
--- a/test/unit/profile_suggestions_job_test.rb
+++ b/test/unit/profile_suggestions_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ProfileSuggestionsJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 68e405d..4cb64a6 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -1709,8 +1709,8 @@ class ProfileTest < ActiveSupport::TestCase
     profile.custom_footer = "<h1> Malformed <><< html ></a>< tag"
     profile.save
 
-    assert_no_match /[<>]/, profile.custom_header
-    assert_no_match /[<>]/, profile.custom_footer
+    assert_match /<h1>&gt; Malformed &gt;&gt; html &gt;<\/h1>/, profile.custom_header
+    assert_match /<h1> Malformed <\/h1>/, profile.custom_footer
   end
 
   should 'not sanitize html comments' do
diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb
new file mode 100644
index 0000000..c795b59
--- /dev/null
+++ b/test/unit/tag_test.rb
@@ -0,0 +1,37 @@
+require_relative "../test_helper"
+require 'tag'
+
+class UserTest < ActiveSupport::TestCase
+
+  def test_find_without_pendings
+    tag1 = Tag.create(name: 'pending_tag', pending: true)
+    tag2 = Tag.create(name: 'approved_tag', pending: false)
+    assert_nothing_raised {Tag.find(tag2.id)}
+    assert_raise(ActiveRecord::RecordNotFound) {Tag.find(tag1.id)}
+  end
+
+  def test_find_pendings
+    tag1 = Tag.create(name: 'pending_tag', pending: true)
+    tag2 = Tag.create(name: 'approved_tag', pending: false)
+    assert Tag.find_pendings.include?(tag1)
+    assert (not Tag.find_pendings.include?(tag2))
+  end
+
+  def test_parent_candidates
+    tag1 = Tag.create(name: 'parent_tag')
+    tag2 = Tag.create(name: 'child_tag', parent_id: tag1.id)
+    assert ( not tag1.parent_candidates.include?(tag2) )
+    assert tag2.parent_candidates.include?(tag1)
+  end
+
+  def test_descendents
+    tag1 = Tag.create(name: 'parent_tag')
+    tag2 = Tag.create(name: 'child_tag', parent_id: tag1.id)
+    tag3 = Tag.create(name: 'grand_tag', parent_id: tag2.id)
+    assert (not tag2.descendents.include?(tag1))
+    assert (not tag1.descendents.include?(tag1))
+    assert tag1.descendents.include?(tag2)
+    assert tag1.descendents.include?(tag3)
+  end
+
+end
diff --git a/test/unit/task_mailer_test.rb b/test/unit/task_mailer_test.rb
index 69e4695..edcaee5 100644
--- a/test/unit/task_mailer_test.rb
+++ b/test/unit/task_mailer_test.rb
@@ -9,29 +9,26 @@ class TaskMailerTest < ActiveSupport::TestCase
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
 
+    @environment = Environment.default
+    @environment.noreply_email = 'noreply@example.com'
+    @environment.stubs(:default_hostname).returns('example.com')
+    @environment.name = 'example'
   end
+  attr_reader :environment
 
   should 'be able to send a "task finished" message' do
 
     task = Task.new
     task.expects(:task_finished_message).returns('the message')
     task.expects(:target_notification_description).returns('the task')
-
-    requestor = mock()
-    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
-    requestor.expects(:name).returns('my name')
-
-    environment = mock()
-    environment.expects(:noreply_email).returns('sender@example.com')
-    environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example').at_least_once
-
-    task.expects(:requestor).returns(requestor).at_least_once
-    requestor.expects(:environment).returns(environment).at_least_once
-    task.expects(:environment).returns(environment).at_least_once
+    task.target = task.requestor = person = Person.new
+    person.environment = environment
+    person.name = 'my name'
+    person.stubs(:contact_email).returns('requestor@example.com')
+    person.stubs(:public_profile_url).returns('requestor_path')
 
     task.send(:send_notification, :finished).deliver
-    assert !ActionMailer::Base.deliveries.empty?
+    assert ActionMailer::Base.deliveries.present?
   end
 
   should 'be able to send a "task cancelled" message' do
@@ -39,19 +36,11 @@ class TaskMailerTest < ActiveSupport::TestCase
     task = Task.new
     task.expects(:task_cancelled_message).returns('the message')
     task.expects(:target_notification_description).returns('the task')
-
-    requestor = mock()
-    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
-    requestor.expects(:name).returns('my name')
-
-    environment = mock()
-    environment.expects(:noreply_email).returns('sender@example.com')
-    environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example').at_least_once
-
-    task.expects(:requestor).returns(requestor).at_least_once
-    requestor.expects(:environment).returns(environment).at_least_once
-    task.expects(:environment).returns(environment).at_least_once
+    task.target = task.requestor = person = Person.new
+    person.environment = environment
+    person.name = 'my name'
+    person.stubs(:contact_email).returns('requestor@example.com')
+    person.stubs(:public_profile_url).returns('requestor_path')
 
     task.send(:send_notification, :cancelled).deliver
     assert !ActionMailer::Base.deliveries.empty?
@@ -63,19 +52,11 @@ class TaskMailerTest < ActiveSupport::TestCase
 
     task.expects(:task_created_message).returns('the message')
     task.expects(:target_notification_description).returns('the task')
-
-    requestor = mock()
-    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
-    requestor.expects(:name).returns('my name')
-
-    environment = mock()
-    environment.expects(:noreply_email).returns('sender@example.com')
-    environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example').at_least_once
-
-    task.expects(:requestor).returns(requestor).at_least_once
-    requestor.expects(:environment).returns(environment).at_least_once
-    task.expects(:environment).returns(environment).at_least_once
+    task.target = task.requestor = person = Person.new
+    person.environment = environment
+    person.name = 'my name'
+    person.stubs(:contact_email).returns('requestor@example.com')
+    person.stubs(:public_profile_url).returns('requestor_path')
 
     task.send(:send_notification, :created).deliver
     assert !ActionMailer::Base.deliveries.empty?
@@ -95,25 +76,15 @@ class TaskMailerTest < ActiveSupport::TestCase
 
     task = InviteFriend.new
     task.expects(:code).returns('123456')
+    task.target = task.requestor = person = Person.new
+    person.environment = environment
+    person.name = 'my name'
+    person.stubs(:public_profile_url).returns('requestor_path')
 
     task.stubs(:message).returns('Hello <friend>, <user> invite you, please follow this link: <url>')
     task.expects(:friend_email).returns('friend@exemple.com')
     task.expects(:friend_name).returns('friend name').at_least_once
 
-    requestor = mock()
-    requestor.stubs(:name).returns('my name')
-    requestor.stubs(:public_profile_url).returns('requestor_path')
-
-    environment = mock()
-    environment.expects(:noreply_email).returns('sender@example.com')
-    environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example').at_least_once
-
-    task.expects(:requestor).returns(requestor).at_least_once
-    task.expects(:person).returns(requestor).at_least_once
-    requestor.expects(:environment).returns(environment).at_least_once
-    task.expects(:environment).returns(environment).at_least_once
-
     mail = TaskMailer.invitation_notification(task)
 
     assert_match(/#{task.target_notification_description}/, mail.subject)
@@ -126,13 +97,9 @@ class TaskMailerTest < ActiveSupport::TestCase
 
   should 'use environment name and no-reply email' do
     task = mock
-    environment = mock
-    environment.expects(:name).returns('My name')
-    environment.expects(:noreply_email).returns('email@example.com')
-
     task.expects(:environment).returns(environment).at_least_once
 
-    assert_equal 'My name <email@example.com>', TaskMailer.generate_from(task)
+    assert_equal "#{environment.name} <#{environment.noreply_email}>", TaskMailer.generate_from(task)
   end
 
   should 'return the email with the subdirectory defined' do
@@ -140,25 +107,15 @@ class TaskMailerTest < ActiveSupport::TestCase
 
     task = InviteFriend.new
     task.expects(:code).returns('123456')
+    task.target = task.requestor = person = Person.new
+    person.environment = environment
+    person.name = 'my name'
+    person.stubs(:public_profile_url).returns('requestor_path')
 
     task.stubs(:message).returns('Hello <friend>, <user> invite you, please follow this link: <url>')
     task.expects(:friend_email).returns('friend@exemple.com')
     task.expects(:friend_name).returns('friend name').at_least_once
 
-    requestor = mock()
-    requestor.stubs(:name).returns('my name')
-    requestor.stubs(:public_profile_url).returns('requestor_path')
-
-    environment = mock()
-    environment.expects(:noreply_email).returns('sender@example.com')
-    environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example').at_least_once
-
-    task.expects(:requestor).returns(requestor).at_least_once
-    task.expects(:person).returns(requestor).at_least_once
-    requestor.expects(:environment).returns(environment).at_least_once
-    task.expects(:environment).returns(environment).at_least_once
-
     mail = TaskMailer.invitation_notification(task)
 
     url_to_compare = "/subdir/account/signup"
diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb
index 73ede84..c52d7f2 100644
--- a/test/unit/task_test.rb
+++ b/test/unit/task_test.rb
@@ -131,7 +131,7 @@ class TaskTest < ActiveSupport::TestCase
 
     task.cancel
 
-    assert_nil Task.from_code(task.code)
+    assert_equal [], Task.from_code(task.code)
   end
 
   should 'be able to find active tasks' do
diff --git a/vendor/plugins/action_tracker/lib/action_tracker_model.rb b/vendor/plugins/action_tracker/lib/action_tracker_model.rb
index 8ec6c86..20ebc03 100644
--- a/vendor/plugins/action_tracker/lib/action_tracker_model.rb
+++ b/vendor/plugins/action_tracker/lib/action_tracker_model.rb
@@ -100,8 +100,7 @@ module ActionTracker
     end
 
     def collect_group_with_index(param)
-      i = -1
-      send("get_#{param}").collect{ |el| yield(el, i += 1) }
+      send("get_#{param}").collect.with_index{ |el, i| yield el, i }
     end
 
     protected
--
libgit2 0.21.2