Updated factory_girl_rails gem

fatfreecrm · Dec 13, 2011 · ce82ffd · ce82ffd
1 parent 229ae28
commit ce82ffd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'factory_girl_rails', '~> 1.0.1'
+  gem 'factory_girl_rails', '~> 1.4.0'
   gem 'simplecov', :platform => :mri_19
   gem 'fuubar'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -54,9 +54,10 @@ GEM
     erubis (2.7.0)
     execjs (1.2.9)
       multi_json (~> 1.0)
-    factory_girl (1.3.3)
-    factory_girl_rails (1.0.1)
-      factory_girl (~> 1.3)
+    factory_girl (2.3.2)
+      activesupport
+    factory_girl_rails (1.4.0)
+      factory_girl (~> 2.3.0)
       railties (>= 3.0.0)
     ffaker (1.10.1)
     fuubar (0.0.6)
@@ -66,7 +67,7 @@ GEM
     haml (3.1.3)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.1)
+    json (1.6.3)
     kgio (2.6.0)
     libv8 (3.3.10.2)
     linecache (0.46)
@@ -78,7 +79,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     paperclip (2.3.16)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
@@ -195,7 +196,7 @@ DEPENDENCIES
   awesome_print (>= 0.3.1)
   coffee-rails (~> 3.1.1)
   factory_girl (>= 1.3.3)
-  factory_girl_rails (~> 1.0.1)
+  factory_girl_rails (~> 1.4.0)
   ffaker (>= 1.5.0)
   fuubar
   haml (>= 3.1.1)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -12,9 +12,6 @@
 # Load factories
 require 'factory_girl'
 require 'ffaker'
-require Rails.root.join("spec/factories/sequences")
-Dir.glob(Rails.root.join("spec/factories/*_factories.rb")).each{ |f| require File.expand_path(f) }
-
 
 # Load factories from plugins (to allow extra validations / etc.)
 Dir.glob(Rails.root.join("vendor/plugins/**/spec/factories.rb")).each{ |f| require File.expand_path(f) }