diff --git a/Gemfile b/Gemfile index b88f9caa8a..3230dd9cad 100644 --- a/Gemfile +++ b/Gemfile @@ -137,7 +137,7 @@ group :test do gem 'rack-test', '~> 0.6.2' gem 'shoulda-context', '~> 1.2' gem 'launchy', '~> 2.3.0' - gem 'factory_girl_rails', '~> 4.5' + gem 'factory_girl_rails', '~> 4.5', require: false gem 'cucumber-rails', '~> 1.4.2', require: false gem 'rack_session_access' gem 'database_cleaner', '~> 1.4.1' @@ -157,7 +157,7 @@ group :test do gem 'rb-readline', '~> 0.5.1' # ruby on CI needs this # why in Gemfile? see: https://github.com/guard/guard-test gem 'ruby-prof' - gem 'simplecov', '0.8.0.pre' + gem 'simplecov', '0.8.0.pre', require: false gem 'shoulda-matchers', '~> 2.8', require: nil gem 'json_spec' gem 'activerecord-tableless', '~> 1.0' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index df3bbed408..1dcf4b57a8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -38,6 +38,7 @@ require 'shoulda/matchers' require 'rspec/example_disabler' require 'capybara/rails' require 'capybara-screenshot/rspec' +require 'factory_girl_rails' Capybara.register_driver :selenium do |app| require 'selenium/webdriver' @@ -151,7 +152,7 @@ end Rails.application.config.plugins_to_test_paths.each do |dir| ['disable_specs.rb', 'config_spec_helper.rb'].each do |file_name| file = File.join(dir, 'spec', file_name) - + if File.exists?(file) puts "Loading #{file}" require file