Download as
Browse Code »

Commit 3decb46dc9c3a747d88032cdb1fa9c38fdda1c44

Authored by Braulio Bhavamitra
1 parent b84e8fa8
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 tests init

Showing 3 changed files with 14 additions and 7 deletions   Show diff stats
test/factories.rb
  Diff comments   View file @3decb46
@@ -140,7 +140,7 @@ module Noosfero::Factory @@ -140,7 +140,7 @@ module Noosfero::Factory
140 end 140 end
141 141
142 def fast_update(obj, data) 142 def fast_update(obj, data)
143 - 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]) 143 + 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])
144 end 144 end
145 145
146 def give_permission(user, permission, target) 146 def give_permission(user, permission, target)
test/test_helper.rb
  Diff comments   View file @3decb46
1 ENV["RAILS_ENV"] = "test" 1 ENV["RAILS_ENV"] = "test"
2 2
3 -require File.expand_path(File.dirname(__FILE__) + "/../config/environment") 3 +require_relative "../config/environment"
4 require 'rails/test_help' 4 require 'rails/test_help'
5 require 'mocha' 5 require 'mocha'
  6 +require 'mocha/mini_test'
6 7
7 require 'authenticated_test_helper' 8 require 'authenticated_test_helper'
8 -require File.dirname(__FILE__) + '/factories'  
9 -require File.dirname(__FILE__) + '/noosfero_doc_test'  
10 -require File.dirname(__FILE__) + '/action_tracker_test_helper' 9 +require_relative 'factories'
  10 +require_relative 'noosfero_doc_test'
  11 +require_relative 'action_tracker_test_helper'
11 12
12 FileUtils.rm_rf(Rails.root.join('index', 'test')) 13 FileUtils.rm_rf(Rails.root.join('index', 'test'))
13 14
@@ -90,7 +91,13 @@ class ActiveSupport::TestCase @@ -90,7 +91,13 @@ class ActiveSupport::TestCase
90 super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers) 91 super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
91 end 92 end
92 93
93 - alias_method :ok, :assert 94 + # deprecated on minitest
  95 + def assert_block message=nil
  96 + assert message || 'yield' do
  97 + yield
  98 + end
  99 + end
  100 + alias_method :ok, :assert_block
94 101
95 def assert_equivalent(enum1, enum2) 102 def assert_equivalent(enum1, enum2)
96 assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>") 103 assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")
test/unit/catalog_helper_test.rb
  Diff comments   View file @3decb46
@@ -6,7 +6,7 @@ class CatalogHelperTest &lt; ActiveSupport::TestCase @@ -6,7 +6,7 @@ class CatalogHelperTest &lt; ActiveSupport::TestCase
6 include ActionView::Helpers::TextHelper 6 include ActionView::Helpers::TextHelper
7 include ActionView::Helpers::UrlHelper 7 include ActionView::Helpers::UrlHelper
8 include ActionView::Helpers::TagHelper 8 include ActionView::Helpers::TagHelper
9 - include ActionDispatch::Assertions::SelectorAssertions 9 + include ::Rails::Dom::Testing::Assertions::SelectorAssertions
10 10
11 def url_for(opts) 11 def url_for(opts)
12 #{:controller => 'catalog', :action => 'index', :level => category.id} 12 #{:controller => 'catalog', :action => 'index', :level => category.id}