From 3decb46dc9c3a747d88032cdb1fa9c38fdda1c44 Mon Sep 17 00:00:00 2001
From: Braulio Bhavamitra <braulio@eita.org.br>
Date: Sat, 4 Apr 2015 23:21:44 -0300
Subject: [PATCH] rails4: fix tests init

---
 test/factories.rb                |  2 +-
 test/test_helper.rb              | 17 ++++++++++++-----
 test/unit/catalog_helper_test.rb |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/factories.rb b/test/factories.rb
index a347ed1..5e9fe99 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -140,7 +140,7 @@ module Noosfero::Factory
   end
 
   def fast_update(obj, data)
-    obj.class.connection.execute('update %s set %s where id = %d' % [obj.class.table_name, ActiveRecord::Base.send(:sanitize_sql_for_assignment, data), obj.id])
+    obj.class.connection.execute('update %s set %s where id = %d' % [obj.class.table_name, obj.class.send(:sanitize_sql_for_assignment, data), obj.id])
   end
 
   def give_permission(user, permission, target)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3eae34d..8a2fdfd 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,13 +1,14 @@
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require_relative "../config/environment"
 require 'rails/test_help'
 require 'mocha'
+require 'mocha/mini_test'
 
 require 'authenticated_test_helper'
-require File.dirname(__FILE__) + '/factories'
-require File.dirname(__FILE__) + '/noosfero_doc_test'
-require File.dirname(__FILE__) + '/action_tracker_test_helper'
+require_relative 'factories'
+require_relative 'noosfero_doc_test'
+require_relative 'action_tracker_test_helper'
 
 FileUtils.rm_rf(Rails.root.join('index', 'test'))
 
@@ -90,7 +91,13 @@ class ActiveSupport::TestCase
     super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
   end
 
-  alias_method :ok, :assert
+  # deprecated on minitest
+  def assert_block message=nil
+    assert message || 'yield' do
+      yield
+    end
+  end
+  alias_method :ok, :assert_block
 
   def assert_equivalent(enum1, enum2)
     assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")
diff --git a/test/unit/catalog_helper_test.rb b/test/unit/catalog_helper_test.rb
index 7ea2a3f..a828824 100644
--- a/test/unit/catalog_helper_test.rb
+++ b/test/unit/catalog_helper_test.rb
@@ -6,7 +6,7 @@ class CatalogHelperTest < ActiveSupport::TestCase
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
-  include ActionDispatch::Assertions::SelectorAssertions
+  include ::Rails::Dom::Testing::Assertions::SelectorAssertions
 
   def url_for(opts)
     #{:controller => 'catalog', :action => 'index', :level => category.id}
--
libgit2 0.21.2