From 35bf9fa59c5486905f642f32fe741f7fcbdb9101 Mon Sep 17 00:00:00 2001 From: Luc Donnet Date: Fri, 20 Feb 2015 15:33:05 +0100 Subject: Update config in a true Rails 4 way --- spec/spec_helper.rb | 7 ------- 1 file changed, 7 deletions(-) (limited to 'spec') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 21dbac2ff..1f9c353dc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,13 +8,6 @@ require 'rspec/rails' require 'capybara/rspec' require 'capybara/rails' require 'capybara/poltergeist' - -# FIXME FactoryGirl not found in jenkins build #13 -unless defined?(FactoryGirl) - require 'factory_girl' - require 'spec/factories.rb' -end -require 'chouette_factories' require 'georuby-ext' require 'will_paginate/array' -- cgit v1.2.3