From 785191e2c29a10a97f3ec2723ef3bde8aeb8efbe Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Thu, 23 Apr 2015 22:34:58 +0200 Subject: [PATCH] Minimal changes - nothing functional --- test/test_helper.rb | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 18b9705..6e9cc65 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ -ENV["RAILS_ENV"] = "test" +ENV['RAILS_ENV'] ||= 'test' require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -#require "minitest/rails" +# require "minitest/rails" +# require "minitest/autorun" # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: @@ -11,13 +12,6 @@ require "rails/test_help" # require "minitest/pride" class ActiveSupport::TestCase - ActiveRecord::Migration.check_pending! - - # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting - fixtures :all - - # Add more helper methods to be used by all tests here... + # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order. + fixtures :all end