diff --git a/Gemfile b/Gemfile index f119ccead..171edac2a 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ group :test do gem 'database_cleaner', '0.9.1' gem 'timecop', '0.5.9' - gem 'factory_girl_rails', '4.1.0' + gem 'factory_girl_rails', '4.2.1' gem 'fixture_builder', '0.3.5' gem 'fuubar', '1.1.0' gem 'rspec-instafail', '0.2.4', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 5e7388ef5..3f6bf3b02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,10 +105,10 @@ GEM excon (0.16.10) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.1.0) + factory_girl (4.2.0) activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl_rails (4.2.1) + factory_girl (~> 4.2.0) railties (>= 3.0.0) faraday (0.8.4) multipart-post (~> 1.1) @@ -421,7 +421,7 @@ DEPENDENCIES cucumber-rails (= 1.3.0) database_cleaner (= 0.9.1) devise (= 2.1.3) - factory_girl_rails (= 4.1.0) + factory_girl_rails (= 4.2.1) faraday (= 0.8.4) faraday_middleware (= 0.9.0) fastercsv (= 1.5.5)