aboutsummaryrefslogtreecommitdiffstats
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorLuc Donnet2015-02-20 15:33:05 +0100
committerLuc Donnet2015-02-20 15:33:05 +0100
commit35bf9fa59c5486905f642f32fe741f7fcbdb9101 (patch)
treedfc06d91e5fe3742ce4c5ebdcea362d7d76bb6ea /spec/spec_helper.rb
parentad74d12ada2bbe2fe961424a3ce529f28cc157da (diff)
downloadchouette-core-35bf9fa59c5486905f642f32fe741f7fcbdb9101.tar.bz2
Update config in a true Rails 4 way
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb7
1 files changed, 0 insertions, 7 deletions
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'