Download as
Browse Code »

Commit 6e6793d8ff1ad4160333b604f0d84a7e99def78e

Authored by Braulio Bhavamitra
1 parent a3c6b602
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: only load minitest on test and use minitest-reporters

Showing 2 changed files with 7 additions and 2 deletions   Show diff stats
1 source "https://rubygems.org" 1 source "https://rubygems.org"
2 gem 'rails', '~> 4.2.0' 2 gem 'rails', '~> 4.2.0'
3 -gem 'minitest'  
4 gem 'fast_gettext', '~> 0.6.8' 3 gem 'fast_gettext', '~> 0.6.8'
5 gem 'acts-as-taggable-on', '~> 3.4.2' 4 gem 'acts-as-taggable-on', '~> 3.4.2'
6 gem 'rails_autolink', '~> 1.1.5' 5 gem 'rails_autolink', '~> 1.1.5'
@@ -48,6 +47,8 @@ group :test do @@ -48,6 +47,8 @@ group :test do
48 gem 'rspec-rails', '~> 2.14.1' 47 gem 'rspec-rails', '~> 2.14.1'
49 gem 'mocha', '~> 1.1.0', :require => false 48 gem 'mocha', '~> 1.1.0', :require => false
50 gem 'test-unit' if RUBY_VERSION >= '2.2.0' 49 gem 'test-unit' if RUBY_VERSION >= '2.2.0'
  50 + gem 'minitest'
  51 + gem 'minitest-reporters'
51 end 52 end
52 53
53 group :cucumber do 54 group :cucumber do
test/test_helper.rb
  Diff comments   View file @6e6793d
@@ -2,9 +2,13 @@ ENV["RAILS_ENV"] = "test" @@ -2,9 +2,13 @@ ENV["RAILS_ENV"] = "test"
2 2
3 require_relative "../config/environment" 3 require_relative "../config/environment"
4 require 'rails/test_help' 4 require 'rails/test_help'
  5 +
5 require 'mocha' 6 require 'mocha'
6 require 'mocha/mini_test' 7 require 'mocha/mini_test'
7 8
  9 +require "minitest/reporters"
  10 +Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new, ENV, Minitest.backtrace_filter
  11 +
8 require 'authenticated_test_helper' 12 require 'authenticated_test_helper'
9 require_relative 'factories' 13 require_relative 'factories'
10 require_relative 'noosfero_doc_test' 14 require_relative 'noosfero_doc_test'
@@ -145,7 +149,7 @@ class ActiveSupport::TestCase @@ -145,7 +149,7 @@ class ActiveSupport::TestCase
145 a = a.to_sym 149 a = a.to_sym
146 next unless options[:attributes].has_key? a 150 next unless options[:attributes].has_key? a
147 attributes[a] = v.value 151 attributes[a] = v.value
148 - end 152 + end if options[:attributes].present?
149 153
150 ret = true 154 ret = true
151 ret &&= options[:attributes].blank? || attributes == options[:attributes] 155 ret &&= options[:attributes].blank? || attributes == options[:attributes]