From 4ae8c622d10815714fcbfc8d11cac44e5eb79597 Mon Sep 17 00:00:00 2001 From: Matt Buck Date: Wed, 18 Mar 2015 11:28:08 -0500 Subject: [PATCH] Upgrade factory_girls MSP-12322 --- Gemfile | 6 +----- Gemfile.lock | 9 ++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index a15ba4f29a..b914fea59c 100755 --- a/Gemfile +++ b/Gemfile @@ -34,12 +34,8 @@ group :development do end group :development, :test do - # supplies factories for producing model instance for specs - # Version 4.1.0 or newer is needed to support generate calls without the - # 'FactoryGirl.' in factory definitions syntax. - gem 'factory_girl', '>= 4.1.0' # automatically include factories from spec/factories - gem 'factory_girl_rails' + gem 'factory_girl_rails', '~> 4.5.0' # Make rspec output shorter and more useful gem 'fivemat', '1.2.1' # running documentation generation tasks and rspec tasks diff --git a/Gemfile.lock b/Gemfile.lock index 3d9295af05..6c88488662 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,10 +137,10 @@ GEM diff-lcs (1.2.5) docile (1.1.5) erubis (2.7.0) - factory_girl (4.4.0) + factory_girl (4.5.0) activesupport (>= 3.0.0) - factory_girl_rails (4.4.1) - factory_girl (~> 4.4.0) + factory_girl_rails (4.5.0) + factory_girl (~> 4.5.0) railties (>= 3.0.0) ffi (1.9.3) fivemat (1.2.1) @@ -254,8 +254,7 @@ PLATFORMS DEPENDENCIES aruba cucumber-rails - factory_girl (>= 4.1.0) - factory_girl_rails + factory_girl_rails (~> 4.5.0) fivemat (= 1.2.1) metasploit-concern! metasploit-credential!