Merge branch '26492-fix-transient-failure-in-commits_spec' into 'master'

Update ffaker to ~>2.4 to avoid generating names with suffixes Closes #26492 See merge request !8596

Merge branch '26492-fix-transient-failure-in-commits_spec' into 'master'
e1f092e3 · Robert Speicher · James Lopez · fad89f37 · e1f092e3 · e1f092e3
Commit e1f092e3 authored Jan 16, 2017 by Robert Speicher Committed by James Lopez Jan 19, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -286,7 +286,7 @@ group :development, :test do
  gem 'minitest', '~> 5.7.0'

  # Generate Fake data
-  gem 'ffaker', '~> 2.0.0'
+  gem 'ffaker', '~> 2.4'

  gem 'capybara',            '~> 2.6.2'
  gem 'capybara-screenshot', '~> 1.0.0'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -198,7 +198,7 @@ GEM
    faraday_middleware-multi_json (0.0.6)
      faraday_middleware
      multi_json
-    ffaker (2.0.0)
+    ffaker (2.4.0)
    ffi (1.9.10)
    flay (2.6.1)
      ruby_parser (~> 3.0)
@@ -877,7 +877,7 @@ DEPENDENCIES
  email_reply_trimmer (~> 0.1)
  email_spec (~> 1.6.0)
  factory_girl_rails (~> 4.7.0)
-  ffaker (~> 2.0.0)
+  ffaker (~> 2.4)
  flay (~> 2.6.1)
  fog-aws (~> 0.9)
  fog-core (~> 1.40)