Download as
Browse Code »

Commit 3decb46dc9c3a747d88032cdb1fa9c38fdda1c44

Authored by Braulio Bhavamitra
1 parent b84e8fa8
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

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 140 end
141 141  
142 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 144 end
145 145  
146 146 def give_permission(user, permission, target)
... ...
test/test_helper.rb
  Diff comments   View file @3decb46
1 1 ENV["RAILS_ENV"] = "test"
2 2  
3   -require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
  3 +require_relative "../config/environment"
4 4 require 'rails/test_help'
5 5 require 'mocha'
  6 +require 'mocha/mini_test'
6 7  
7 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 13 FileUtils.rm_rf(Rails.root.join('index', 'test'))
13 14  
... ... @@ -90,7 +91,13 @@ class ActiveSupport::TestCase
90 91 super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
91 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 102 def assert_equivalent(enum1, enum2)
96 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 6 include ActionView::Helpers::TextHelper
7 7 include ActionView::Helpers::UrlHelper
8 8 include ActionView::Helpers::TagHelper
9   - include ActionDispatch::Assertions::SelectorAssertions
  9 + include ::Rails::Dom::Testing::Assertions::SelectorAssertions
10 10  
11 11 def url_for(opts)
12 12 #{:controller => 'catalog', :action => 'index', :level => category.id}
... ...