From 4e3516788fdea3de3c5f06e1981ddc518b05d0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 23 Mar 2017 14:08:39 +0100
Subject: [PATCH 1/6] Don't use FFaker in factories, use sequences instead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FFaker can generate data that randomly break our test suite. This
simplifies our factories and use sequences which are more predictive.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 features/steps/project/hooks.rb                 |  4 ++--
 .../profiles/personal_access_tokens_spec.rb     |  2 +-
 spec/factories/chat_names.rb                    |  8 ++------
 spec/factories/chat_teams.rb                    |  5 +----
 spec/factories/ci/runners.rb                    |  4 +---
 spec/factories/emails.rb                        |  2 +-
 spec/factories/issues.rb                        |  4 ----
 spec/factories/labels.rb                        |  4 ++--
 spec/factories/oauth_applications.rb            |  4 ++--
 spec/factories/personal_access_tokens.rb        |  2 +-
 spec/factories/project_hooks.rb                 |  2 +-
 spec/factories/sequences.rb                     | 10 ++++++++++
 spec/factories/service_hooks.rb                 |  2 +-
 spec/factories/snippets.rb                      |  9 ++-------
 spec/factories/spam_logs.rb                     |  6 +++---
 spec/factories/system_hooks.rb                  |  2 +-
 spec/factories/users.rb                         |  8 +++-----
 spec/features/admin/admin_hooks_spec.rb         |  2 +-
 .../admin_users_impersonation_tokens_spec.rb    |  2 +-
 spec/features/issuables/issuable_list_spec.rb   |  9 ++++-----
 .../profiles/personal_access_tokens_spec.rb     |  4 ++--
 spec/features/u2f_spec.rb                       | 17 ++++++++---------
 spec/lib/gitlab/git_access_spec.rb              |  8 ++++----
 spec/lib/gitlab/git_spec.rb                     | 17 ++---------------
 spec/mailers/notify_spec.rb                     |  4 ++--
 spec/models/cycle_analytics/plan_spec.rb        |  4 ++--
 spec/models/cycle_analytics/production_spec.rb  |  2 +-
 spec/models/cycle_analytics/staging_spec.rb     |  2 +-
 spec/models/repository_spec.rb                  | 17 ++---------------
 spec/requests/api/files_spec.rb                 | 17 ++---------------
 spec/requests/api/projects_spec.rb              |  2 --
 spec/requests/api/v3/files_spec.rb              |  4 ++--
 spec/requests/api/v3/projects_spec.rb           |  2 --
 spec/support/cycle_analytics_helpers.rb         | 12 +++++-------
 spec/support/git_helpers.rb                     |  9 ---------
 .../issuables_list_metadata_shared_examples.rb  |  4 ++--
 ...te_service_slash_commands_shared_examples.rb |  2 +-
 37 files changed, 76 insertions(+), 142 deletions(-)
 create mode 100644 spec/factories/sequences.rb
 delete mode 100644 spec/support/git_helpers.rb

diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
index 37b608ffbd36..0a71833a8a10 100644
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
@@ -23,13 +23,13 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
   end
 
   step 'I submit new hook' do
-    @url = FFaker::Internet.uri("http")
+    @url = 'http://example.org/1'
     fill_in "hook_url", with: @url
     expect { click_button "Add Webhook" }.to change(ProjectHook, :count).by(1)
   end
 
   step 'I submit new hook with SSL verification enabled' do
-    @url = FFaker::Internet.uri("http")
+    @url = 'http://example.org/2'
     fill_in "hook_url", with: @url
     check "hook_enable_ssl_verification"
     expect { click_button "Add Webhook" }.to change(ProjectHook, :count).by(1)
diff --git a/spec/controllers/profiles/personal_access_tokens_spec.rb b/spec/controllers/profiles/personal_access_tokens_spec.rb
index dfed1de2046d..98a43e278b21 100644
--- a/spec/controllers/profiles/personal_access_tokens_spec.rb
+++ b/spec/controllers/profiles/personal_access_tokens_spec.rb
@@ -12,7 +12,7 @@ def created_token
     end
 
     it "allows creation of a token with scopes" do
-      name = FFaker::Product.brand
+      name = 'My PAT'
       scopes = %w[api read_user]
 
       post :create, personal_access_token: token_attributes.merge(scopes: scopes, name: name)
diff --git a/spec/factories/chat_names.rb b/spec/factories/chat_names.rb
index 24225468d554..9a0be1a4598d 100644
--- a/spec/factories/chat_names.rb
+++ b/spec/factories/chat_names.rb
@@ -6,11 +6,7 @@
     team_id 'T0001'
     team_domain 'Awesome Team'
 
-    sequence :chat_id do |n|
-      "U#{n}"
-    end
-    sequence :chat_name do |n|
-      "user#{n}"
-    end
+    sequence(:chat_id) { |n| "U#{n}" }
+    chat_name { generate(:username) }
   end
 end
diff --git a/spec/factories/chat_teams.rb b/spec/factories/chat_teams.rb
index 82f44fa3d157..ffedf69a69be 100644
--- a/spec/factories/chat_teams.rb
+++ b/spec/factories/chat_teams.rb
@@ -1,9 +1,6 @@
 FactoryGirl.define do
   factory :chat_team, class: ChatTeam do
-    sequence :team_id do |n|
-      "abcdefghijklm#{n}"
-    end
-
+    sequence(:team_id) { |n| "abcdefghijklm#{n}" }
     namespace factory: :group
   end
 end
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index c3b4aff55ba6..05abf60d5ce8 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -1,8 +1,6 @@
 FactoryGirl.define do
   factory :ci_runner, class: Ci::Runner do
-    sequence :description do |n|
-      "My runner#{n}"
-    end
+    sequence(:description) { |n| "My runner#{n}" }
 
     platform  "darwin"
     is_shared false
diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index 9794772ac7d8..8303861bcfe3 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :email do
     user
-    email { FFaker::Internet.email('alias') }
+    email { generate(:email_alias) }
   end
 end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 7e09f1ba8ea7..dbd0fff8376a 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,8 +1,4 @@
 FactoryGirl.define do
-  sequence :issue_created_at do |n|
-    4.hours.ago + ( 2 * n ).seconds
-  end
-
   factory :issue do
     title
     author
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index 5ba8443c62c7..5706ab6a7679 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :label, class: ProjectLabel do
-    sequence(:title) { |n| "label#{n}" }
+    title { generate(:label) }
     color "#990000"
     project factory: :empty_project
 
@@ -16,7 +16,7 @@
   end
 
   factory :group_label, class: GroupLabel do
-    sequence(:title) { |n| "label#{n}" }
+    title { generate(:label) }
     color "#990000"
     group
   end
diff --git a/spec/factories/oauth_applications.rb b/spec/factories/oauth_applications.rb
index 86cdc2082686..c7ede40f2409 100644
--- a/spec/factories/oauth_applications.rb
+++ b/spec/factories/oauth_applications.rb
@@ -1,8 +1,8 @@
 FactoryGirl.define do
   factory :oauth_application, class: 'Doorkeeper::Application', aliases: [:application] do
-    name { FFaker::Name.name }
+    sequence(:name) { |n| "OAuth App #{n}" }
     uid { Doorkeeper::OAuth::Helpers::UniqueToken.generate }
-    redirect_uri { FFaker::Internet.uri('http') }
+    redirect_uri { generate(:url) }
     owner
     owner_type 'User'
   end
diff --git a/spec/factories/personal_access_tokens.rb b/spec/factories/personal_access_tokens.rb
index 7b15ba47de18..06acaff6cd02 100644
--- a/spec/factories/personal_access_tokens.rb
+++ b/spec/factories/personal_access_tokens.rb
@@ -2,7 +2,7 @@
   factory :personal_access_token do
     user
     token { SecureRandom.hex(50) }
-    name { FFaker::Product.brand }
+    sequence(:name) { |n| "PAT #{n}" }
     revoked false
     expires_at { 5.days.from_now }
     scopes ['api']
diff --git a/spec/factories/project_hooks.rb b/spec/factories/project_hooks.rb
index 424ecc65759c..39c2a9dd1fb6 100644
--- a/spec/factories/project_hooks.rb
+++ b/spec/factories/project_hooks.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :project_hook do
-    url { FFaker::Internet.uri('http') }
+    url { generate(:url) }
 
     trait :token do
       token { SecureRandom.hex(10) }
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
new file mode 100644
index 000000000000..5b8501aa770e
--- /dev/null
+++ b/spec/factories/sequences.rb
@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  sequence(:username) { |n| "user#{n}" }
+  sequence(:name) { |n| "John Doe#{n}" }
+  sequence(:email) { |n| "user#{n}@example.org" }
+  sequence(:email_alias) { |n| "user.alias#{n}@example.org" }
+  sequence(:url) { |n| "http://example#{n}.org" }
+  sequence(:label) { |n| "label#{n}" }
+  sequence(:branch) { |n| "my-branch-#{n}" }
+  sequence(:issue_created_at) { |n| 4.hours.ago + (2 * n).seconds }
+end
diff --git a/spec/factories/service_hooks.rb b/spec/factories/service_hooks.rb
index 6dd6af63f3e6..e3f88ab8fcc3 100644
--- a/spec/factories/service_hooks.rb
+++ b/spec/factories/service_hooks.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :service_hook do
-    url { FFaker::Internet.uri('http') }
+    url { generate(:url) }
     service
   end
 end
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index 365f12a0c952..fb87c584f0b7 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -1,11 +1,6 @@
 FactoryGirl.define do
-  sequence :title, aliases: [:content] do
-    FFaker::Lorem.sentence
-  end
-
-  sequence :file_name do
-    FFaker::Internet.user_name
-  end
+  sequence(:title, aliases: [:content]) { |n| "My snippet #{n}" }
+  sequence(:file_name) { |n| "snippet-#{n}.rb" }
 
   factory :snippet do
     author
diff --git a/spec/factories/spam_logs.rb b/spec/factories/spam_logs.rb
index a4f6d291269b..e369f9f13e9d 100644
--- a/spec/factories/spam_logs.rb
+++ b/spec/factories/spam_logs.rb
@@ -1,9 +1,9 @@
 FactoryGirl.define do
   factory :spam_log do
     user
-    source_ip { FFaker::Internet.ip_v4_address }
+    sequence(:source_ip) { |n| "42.42.42.#{n % 255}" }
     noteable_type 'Issue'
-    title { FFaker::Lorem.sentence }
-    description { FFaker::Lorem.paragraph(5) }
+    sequence(:title) { |n| "Spam title #{n}" }
+    description { "Spam description\nwith\nmultiple\nlines" }
   end
 end
diff --git a/spec/factories/system_hooks.rb b/spec/factories/system_hooks.rb
index c786e9cb79b8..841e1e293e86 100644
--- a/spec/factories/system_hooks.rb
+++ b/spec/factories/system_hooks.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
   factory :system_hook do
-    url { FFaker::Internet.uri('http') }
+    url { generate(:url) }
   end
 end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 249dabbaae84..e1ae94a08e46 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,10 +1,8 @@
 FactoryGirl.define do
-  sequence(:name) { FFaker::Name.name }
-
   factory :user, aliases: [:author, :assignee, :recipient, :owner, :creator, :resource_owner] do
-    email { FFaker::Internet.email }
-    name
-    sequence(:username) { |n| "#{FFaker::Internet.user_name}#{n}" }
+    email { generate(:email) }
+    name { generate(:name) }
+    username { generate(:username) }
     password "12345678"
     confirmed_at { Time.now }
     confirmation_token { nil }
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index f246997d5a23..570c374a89b0 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -26,7 +26,7 @@
   end
 
   describe "New Hook" do
-    let(:url) { FFaker::Internet.uri('http') }
+    let(:url) { generate(:url) }
 
     it 'adds new hook' do
       visit admin_hooks_path
diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
index 9ff5c2f9d407..ff23d4863556 100644
--- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb
+++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
@@ -16,7 +16,7 @@ def inactive_impersonation_tokens
 
   describe "token creation" do
     it "allows creation of a token" do
-      name = FFaker::Product.brand
+      name = 'Hello World'
 
       visit admin_user_impersonation_tokens_path(user_id: user.username)
       fill_in "Name", with: name
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index b90bf6268fdf..f324354dd46f 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -46,16 +46,16 @@ def visit_issuable_list(issuable_type)
   end
 
   def create_issuables(issuable_type)
-    3.times do
+    3.times do |n|
       issuable =
         if issuable_type == :issue
           create(:issue, project: project, author: user)
         else
-          create(:merge_request, title: FFaker::Lorem.sentence, source_project: project, source_branch: FFaker::Name.name)
+          create(:merge_request, source_project: project, source_branch: "#{n}-feature")
         end
 
       2.times do
-        create(:note_on_issue, noteable: issuable, project: project, note: 'Test note')
+        create(:note_on_issue, noteable: issuable, project: project)
       end
 
       create(:award_emoji, :downvote, awardable: issuable)
@@ -65,9 +65,8 @@ def create_issuables(issuable_type)
     if issuable_type == :issue
       issue = Issue.reorder(:iid).first
       merge_request = create(:merge_request,
-                              title: FFaker::Lorem.sentence,
                               source_project: project,
-                              source_branch: FFaker::Name.name)
+                              source_branch: 'my-bug-fix')
 
       MergeRequestsClosingIssues.create!(issue: issue, merge_request: merge_request)
     end
diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb
index 0917d4dc3ef8..99fba5946511 100644
--- a/spec/features/profiles/personal_access_tokens_spec.rb
+++ b/spec/features/profiles/personal_access_tokens_spec.rb
@@ -27,7 +27,7 @@ def disallow_personal_access_token_saves!
 
   describe "token creation" do
     it "allows creation of a personal access token" do
-      name = FFaker::Product.brand
+      name = 'My PAT'
 
       visit profile_personal_access_tokens_path
       fill_in "Name", with: name
@@ -52,7 +52,7 @@ def disallow_personal_access_token_saves!
       it "displays an error message" do
         disallow_personal_access_token_saves!
         visit profile_personal_access_tokens_path
-        fill_in "Name", with: FFaker::Product.brand
+        fill_in "Name", with: 'My PAT'
 
         expect { click_on "Create Personal Access Token" }.not_to change { PersonalAccessToken.count }
         expect(page).to have_content("Name cannot be nil")
diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
index a8d00bb8e5aa..28373098123e 100644
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature: true, js: true do
+feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
   include WaitForAjax
 
   before { allow_any_instance_of(U2fHelper).to receive(:inject_u2f_api?).and_return(true) }
@@ -11,8 +11,7 @@ def manage_two_factor_authentication
     wait_for_ajax
   end
 
-  def register_u2f_device(u2f_device = nil)
-    name = FFaker::Name.first_name
+  def register_u2f_device(u2f_device = nil, name: 'My device')
     u2f_device ||= FakeU2fDevice.new(page, name)
     u2f_device.respond_to_u2f_registration
     click_on 'Setup New U2F Device'
@@ -62,7 +61,7 @@ def register_u2f_device(u2f_device = nil)
         expect(page).to have_content('Your U2F device was registered')
 
         # Second device
-        second_device = register_u2f_device
+        second_device = register_u2f_device(name: 'My other device')
         expect(page).to have_content('Your U2F device was registered')
 
         expect(page).to have_content(first_device.name)
@@ -76,7 +75,7 @@ def register_u2f_device(u2f_device = nil)
         expect(page).to have_content("You've already enabled two-factor authentication using mobile")
 
         first_u2f_device = register_u2f_device
-        second_u2f_device = register_u2f_device
+        second_u2f_device = register_u2f_device(name: 'My other device')
 
         click_on "Delete", match: :first
 
@@ -99,7 +98,7 @@ def register_u2f_device(u2f_device = nil)
       user.update_attribute(:otp_required_for_login, true)
       visit profile_account_path
       manage_two_factor_authentication
-      register_u2f_device(u2f_device)
+      register_u2f_device(u2f_device, name: 'My other device')
       expect(page).to have_content('Your U2F device was registered')
 
       expect(U2fRegistration.count).to eq(2)
@@ -198,7 +197,7 @@ def register_u2f_device(u2f_device = nil)
           current_user.update_attribute(:otp_required_for_login, true)
           visit profile_account_path
           manage_two_factor_authentication
-          register_u2f_device
+          register_u2f_device(name: 'My other device')
           logout
 
           # Try authenticating user with the old U2F device
@@ -231,7 +230,7 @@ def register_u2f_device(u2f_device = nil)
 
     describe "when a given U2F device has not been registered" do
       it "does not allow logging in with that particular device" do
-        unregistered_device = FakeU2fDevice.new(page, FFaker::Name.first_name)
+        unregistered_device = FakeU2fDevice.new(page, 'My device')
         login_as(user)
         unregistered_device.respond_to_u2f_authentication
         expect(page).to have_content('We heard back from your U2F device')
@@ -252,7 +251,7 @@ def register_u2f_device(u2f_device = nil)
         # Register second device
         visit profile_two_factor_auth_path
         expect(page).to have_content("Your U2F device needs to be set up.")
-        second_device = register_u2f_device
+        second_device = register_u2f_device(name: 'My other device')
         logout
 
         # Authenticate as both devices
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index 48f7754bed8f..703b41f95acf 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -183,7 +183,7 @@ def disable_protocol(protocol)
 
   describe '#check_push_access!' do
     before { merge_into_protected_branch }
-    let(:unprotected_branch) { FFaker::Internet.user_name }
+    let(:unprotected_branch) { 'unprotected_branch' }
 
     let(:changes) do
       { push_new_branch: "#{Gitlab::Git::BLANK_SHA} 570e7b2ab refs/heads/wow",
@@ -211,9 +211,9 @@ def merge_into_protected_branch
         target_branch = project.repository.lookup('feature')
         source_branch = project.repository.create_file(
           user,
-          FFaker::InternetSE.login_user_name,
-          FFaker::HipsterIpsum.paragraph,
-          message: FFaker::HipsterIpsum.sentence,
+          'John Doe',
+          'This is the file content',
+          message: 'This is a good commit message',
           branch_name: unprotected_branch)
         rugged = project.repository.rugged
         author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
diff --git a/spec/lib/gitlab/git_spec.rb b/spec/lib/gitlab/git_spec.rb
index 8eaf7aac2646..36f0e6507c8a 100644
--- a/spec/lib/gitlab/git_spec.rb
+++ b/spec/lib/gitlab/git_spec.rb
@@ -1,21 +1,8 @@
 require 'spec_helper'
 
 describe Gitlab::Git, lib: true do
-  let(:committer_email) { FFaker::Internet.email }
-
-  # I have to remove periods from the end of the name
-  # This happened when the user's name had a suffix (i.e. "Sr.")
-  # This seems to be what git does under the hood. For example, this commit:
-  #
-  # $ git commit --author='Foo Sr. <foo@example.com>' -m 'Where's my trailing period?'
-  #
-  # results in this:
-  #
-  # $ git show --pretty
-  # ...
-  # Author: Foo Sr <foo@example.com>
-  # ...
-  let(:committer_name) { FFaker::Name.name.chomp("\.") }
+  let(:committer_email) { 'user@example.org' }
+  let(:committer_name) { 'John Doe' }
 
   describe 'committer_hash' do
     it "returns a hash containing the given email and name" do
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index f60c5ffb32a6..6a89b007f96b 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -37,7 +37,7 @@ def have_referable_subject(referable, reply: false)
 
       context 'for issues' do
         let(:issue) { create(:issue, author: current_user, assignee: assignee, project: project) }
-        let(:issue_with_description) { create(:issue, author: current_user, assignee: assignee, project: project, description: FFaker::Lorem.sentence) }
+        let(:issue_with_description) { create(:issue, author: current_user, assignee: assignee, project: project, description: 'My awesome description') }
 
         describe 'that are new' do
           subject { Notify.new_issue_email(issue.assignee_id, issue.id) }
@@ -187,7 +187,7 @@ def have_referable_subject(referable, reply: false)
         let(:project) { create(:project, :repository) }
         let(:merge_author) { create(:user) }
         let(:merge_request) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project) }
-        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: FFaker::Lorem.sentence) }
+        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: 'My awesome description') }
 
         describe 'that are new' do
           subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
diff --git a/spec/models/cycle_analytics/plan_spec.rb b/spec/models/cycle_analytics/plan_spec.rb
index 55483fc876a7..4f33f3c6d69a 100644
--- a/spec/models/cycle_analytics/plan_spec.rb
+++ b/spec/models/cycle_analytics/plan_spec.rb
@@ -13,7 +13,7 @@
     data_fn: -> (context) do
       {
         issue: context.create(:issue, project: context.project),
-        branch_name: context.random_git_name
+        branch_name: context.generate(:branch)
       }
     end,
     start_time_conditions: [["issue associated with a milestone",
@@ -35,7 +35,7 @@
 
   context "when a regular label (instead of a list label) is added to the issue" do
     it "returns nil" do
-      branch_name = random_git_name
+      branch_name = generate(:branch)
       label = create(:label)
       issue = create(:issue, project: project)
       issue.update(label_ids: [label.id])
diff --git a/spec/models/cycle_analytics/production_spec.rb b/spec/models/cycle_analytics/production_spec.rb
index e6a826a9418c..4744b9e05ea7 100644
--- a/spec/models/cycle_analytics/production_spec.rb
+++ b/spec/models/cycle_analytics/production_spec.rb
@@ -23,7 +23,7 @@
           # Make other changes on master
           sha = context.project.repository.create_file(
             context.user,
-            context.random_git_name,
+            context.generate(:branch),
             'content',
             message: 'commit message',
             branch_name: 'master')
diff --git a/spec/models/cycle_analytics/staging_spec.rb b/spec/models/cycle_analytics/staging_spec.rb
index 3a02ed81adb5..f78d7a231050 100644
--- a/spec/models/cycle_analytics/staging_spec.rb
+++ b/spec/models/cycle_analytics/staging_spec.rb
@@ -28,7 +28,7 @@
                                # Make other changes on master
                                sha = context.project.repository.create_file(
                                  context.user,
-                                 context.random_git_name,
+                                 context.generate(:branch),
                                  'content',
                                  message: 'commit message',
                                  branch_name: 'master')
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index df742ee8084c..5899e121e68f 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -24,21 +24,8 @@
     repository.commit(merge_commit_id)
   end
 
-  let(:author_email) { FFaker::Internet.email }
-
-  # I have to remove periods from the end of the name
-  # This happened when the user's name had a suffix (i.e. "Sr.")
-  # This seems to be what git does under the hood. For example, this commit:
-  #
-  # $ git commit --author='Foo Sr. <foo@example.com>' -m 'Where's my trailing period?'
-  #
-  # results in this:
-  #
-  # $ git show --pretty
-  # ...
-  # Author: Foo Sr <foo@example.com>
-  # ...
-  let(:author_name) { FFaker::Name.name.chomp("\.") }
+  let(:author_email) { 'user@example.org' }
+  let(:author_name) { 'John Doe' }
 
   describe '#branch_names_contains' do
     subject { repository.branch_names_contains(sample_commit.id) }
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index a7fad7f0bdb9..8012530f1396 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -11,21 +11,8 @@
       ref: 'master'
     }
   end
-  let(:author_email) { FFaker::Internet.email }
-
-  # I have to remove periods from the end of the name
-  # This happened when the user's name had a suffix (i.e. "Sr.")
-  # This seems to be what git does under the hood. For example, this commit:
-  #
-  # $ git commit --author='Foo Sr. <foo@example.com>' -m 'Where's my trailing period?'
-  #
-  # results in this:
-  #
-  # $ git show --pretty
-  # ...
-  # Author: Foo Sr <foo@example.com>
-  # ...
-  let(:author_name) { FFaker::Name.name.chomp("\.") }
+  let(:author_email) { 'user@example.org' }
+  let(:author_name) { 'John Doe' }
 
   before { project.team << [user, :developer] }
 
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index a3de4702ad0d..2e291eb3ceaf 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -341,7 +341,6 @@
     it "assigns attributes to project" do
       project = attributes_for(:project, {
         path: 'camelCasePath',
-        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false,
@@ -475,7 +474,6 @@
 
     it 'assigns attributes to project' do
       project = attributes_for(:project, {
-        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false,
diff --git a/spec/requests/api/v3/files_spec.rb b/spec/requests/api/v3/files_spec.rb
index 3b61139a2cd5..349fd6b34155 100644
--- a/spec/requests/api/v3/files_spec.rb
+++ b/spec/requests/api/v3/files_spec.rb
@@ -26,8 +26,8 @@
       ref: 'master'
     }
   end
-  let(:author_email) { FFaker::Internet.email }
-  let(:author_name) { FFaker::Name.name.chomp("\.") }
+  let(:author_email) { 'user@example.org' }
+  let(:author_name) { 'John Doe' }
 
   before { project.team << [user, :developer] }
 
diff --git a/spec/requests/api/v3/projects_spec.rb b/spec/requests/api/v3/projects_spec.rb
index b1aa793ec00e..40531fe7545a 100644
--- a/spec/requests/api/v3/projects_spec.rb
+++ b/spec/requests/api/v3/projects_spec.rb
@@ -356,7 +356,6 @@
     it "assigns attributes to project" do
       project = attributes_for(:project, {
         path: 'camelCasePath',
-        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false,
@@ -501,7 +500,6 @@
 
     it 'assigns attributes to project' do
       project = attributes_for(:project, {
-        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false,
diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb
index c864a705ca40..37ee4d557698 100644
--- a/spec/support/cycle_analytics_helpers.rb
+++ b/spec/support/cycle_analytics_helpers.rb
@@ -1,15 +1,13 @@
 module CycleAnalyticsHelpers
-  def create_commit_referencing_issue(issue, branch_name: random_git_name)
-    project.repository.add_branch(user, branch_name, 'master')
+  def create_commit_referencing_issue(issue, branch_name: nil)
+    project.repository.add_branch(user, branch_name || generate(:branch), 'master')
     create_commit("Commit for ##{issue.iid}", issue.project, user, branch_name)
   end
 
   def create_commit(message, project, user, branch_name, count: 1)
     oldrev = project.repository.commit(branch_name).sha
     commit_shas = Array.new(count) do |index|
-      filename = random_git_name
-
-      commit_sha = project.repository.create_file(user, filename, "content", message: message, branch_name: branch_name)
+      commit_sha = project.repository.create_file(user, generate(:branch), "content", message: message, branch_name: branch_name)
       project.repository.commit(commit_sha)
 
       commit_sha
@@ -24,13 +22,13 @@ def create_commit(message, project, user, branch_name, count: 1)
 
   def create_merge_request_closing_issue(issue, message: nil, source_branch: nil)
     if !source_branch || project.repository.commit(source_branch).blank?
-      source_branch = random_git_name
+      source_branch = generate(:branch)
       project.repository.add_branch(user, source_branch, 'master')
     end
 
     sha = project.repository.create_file(
       user,
-      random_git_name,
+      generate(:branch),
       'content',
       message: 'commit message',
       branch_name: source_branch)
diff --git a/spec/support/git_helpers.rb b/spec/support/git_helpers.rb
deleted file mode 100644
index 93422390ef72..000000000000
--- a/spec/support/git_helpers.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module GitHelpers
-  def random_git_name
-    "#{FFaker::Product.brand}-#{FFaker::Product.brand}-#{rand(1000)}"
-  end
-end
-
-RSpec.configure do |config|
-  config.include GitHelpers
-end
diff --git a/spec/support/issuables_list_metadata_shared_examples.rb b/spec/support/issuables_list_metadata_shared_examples.rb
index 4c0f556e7363..7ea4073ef2bc 100644
--- a/spec/support/issuables_list_metadata_shared_examples.rb
+++ b/spec/support/issuables_list_metadata_shared_examples.rb
@@ -2,12 +2,12 @@
   before do
     @issuable_ids = []
 
-    2.times do
+    2.times do |n|
       issuable =
         if issuable_type == :issue
           create(issuable_type, project: project)
         else
-          create(issuable_type, title: FFaker::Lorem.sentence, source_project: project, source_branch: FFaker::Name.name)
+          create(issuable_type, source_project: project, source_branch: "#{n}-feature")
         end
 
       @issuable_ids << issuable.id
diff --git a/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb b/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
index ee492daee30d..9e9cdf3e48b4 100644
--- a/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
+++ b/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
@@ -7,7 +7,7 @@
   let(:assignee) { create(:user) }
   let!(:milestone) { create(:milestone, project: project) }
   let!(:labels) { create_list(:label, 3, project: project) }
-  let(:base_params) { { title: FFaker::Lorem.sentence(3) } }
+  let(:base_params) { { title: 'My issuable title' } }
   let(:params) { base_params.merge(defined?(default_params) ? default_params : {}).merge(example_params) }
   let(:issuable) { described_class.new(project, user, params).execute }
 
-- 
GitLab


From 5f7cb26394921535a6e1e15f3baee7666c3ef654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 23 Mar 2017 17:23:51 +0100
Subject: [PATCH 2/6] Fix the AbuseReport seeder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 db/fixtures/development/18_abuse_reports.rb | 26 ++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/db/fixtures/development/18_abuse_reports.rb b/db/fixtures/development/18_abuse_reports.rb
index 8618d10387a2..7e67262b59ef 100644
--- a/db/fixtures/development/18_abuse_reports.rb
+++ b/db/fixtures/development/18_abuse_reports.rb
@@ -1,5 +1,25 @@
-require 'factory_girl_rails'
+module Db
+  module Fixtures
+    class Development
+      def self.seed
+        Gitlab::Seeder.quiet do
+          (AbuseReport.default_per_page + 3).times do
+            reported_user =
+              User.create!(
+                username: FFaker::Internet.user_name,
+                name: FFaker::Name.name,
+                email: FFaker::Internet.email,
+                confirmed_at: DateTime.now,
+                password: '12345678'
+              )
 
-(AbuseReport.default_per_page + 3).times do
-  FactoryGirl.create(:abuse_report)
+            AbuseReport.create(reporter: User.take, user: reported_user, message: 'User sends spam')
+            print '.'
+          end
+        end
+      end
+    end
+  end
 end
+
+Db::Fixtures::Development.seed
-- 
GitLab


From 169dc4cec1f45cdcc548e3e682e4fd6f4c98926a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 23 Mar 2017 17:37:14 +0100
Subject: [PATCH 3/6] Fix brittle specs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/factories/issues.rb                           | 2 +-
 spec/factories/merge_requests.rb                   | 2 +-
 spec/factories/sequences.rb                        | 2 ++
 spec/factories/snippets.rb                         | 9 +++------
 spec/features/admin/admin_browse_spam_logs_spec.rb | 2 +-
 spec/features/issuables/issuable_list_spec.rb      | 4 ++--
 spec/support/cycle_analytics_helpers.rb            | 4 ++--
 spec/support/filter_spec_helper.rb                 | 4 ++--
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index dbd0fff8376a..0b6977e3b17b 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :issue do
-    title
+    title { generate(:title) }
     author
     project factory: :empty_project
 
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index ae0bbbd6aeb8..e36fe326e1c7 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :merge_request do
-    title
+    title { generate(:title) }
     author
     association :source_project, :repository, factory: :project
     target_project { source_project }
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
index 5b8501aa770e..2321455bfeed 100644
--- a/spec/factories/sequences.rb
+++ b/spec/factories/sequences.rb
@@ -3,6 +3,8 @@
   sequence(:name) { |n| "John Doe#{n}" }
   sequence(:email) { |n| "user#{n}@example.org" }
   sequence(:email_alias) { |n| "user.alias#{n}@example.org" }
+  sequence(:title) { |n| "My title #{n}" }
+  sequence(:filename) { |n| "filename-#{n}.rb" }
   sequence(:url) { |n| "http://example#{n}.org" }
   sequence(:label) { |n| "label#{n}" }
   sequence(:branch) { |n| "my-branch-#{n}" }
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index fb87c584f0b7..18cb0f5de262 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -1,12 +1,9 @@
 FactoryGirl.define do
-  sequence(:title, aliases: [:content]) { |n| "My snippet #{n}" }
-  sequence(:file_name) { |n| "snippet-#{n}.rb" }
-
   factory :snippet do
     author
-    title
-    content
-    file_name
+    title { generate(:title) }
+    content { generate(:title) }
+    file_name { generate(:filename) }
 
     trait :public do
       visibility_level Snippet::PUBLIC
diff --git a/spec/features/admin/admin_browse_spam_logs_spec.rb b/spec/features/admin/admin_browse_spam_logs_spec.rb
index 562ace925985..bee57472270f 100644
--- a/spec/features/admin/admin_browse_spam_logs_spec.rb
+++ b/spec/features/admin/admin_browse_spam_logs_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Admin browse spam logs' do
-  let!(:spam_log) { create(:spam_log) }
+  let!(:spam_log) { create(:spam_log, description: 'abcde ' * 20) }
 
   before do
     login_as :admin
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index f324354dd46f..3dc872ae5200 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -51,7 +51,7 @@ def create_issuables(issuable_type)
         if issuable_type == :issue
           create(:issue, project: project, author: user)
         else
-          create(:merge_request, source_project: project, source_branch: "#{n}-feature")
+          create(:merge_request, source_project: project, source_branch: generate(:branch))
         end
 
       2.times do
@@ -66,7 +66,7 @@ def create_issuables(issuable_type)
       issue = Issue.reorder(:iid).first
       merge_request = create(:merge_request,
                               source_project: project,
-                              source_branch: 'my-bug-fix')
+                              source_branch: generate(:branch))
 
       MergeRequestsClosingIssues.create!(issue: issue, merge_request: merge_request)
     end
diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb
index 37ee4d557698..8ad042f5e3bc 100644
--- a/spec/support/cycle_analytics_helpers.rb
+++ b/spec/support/cycle_analytics_helpers.rb
@@ -1,6 +1,6 @@
 module CycleAnalyticsHelpers
-  def create_commit_referencing_issue(issue, branch_name: nil)
-    project.repository.add_branch(user, branch_name || generate(:branch), 'master')
+  def create_commit_referencing_issue(issue, branch_name: generate(:branch))
+    project.repository.add_branch(user, branch_name, 'master')
     create_commit("Commit for ##{issue.iid}", issue.project, user, branch_name)
   end
 
diff --git a/spec/support/filter_spec_helper.rb b/spec/support/filter_spec_helper.rb
index a8e454eb09ef..b871b7ffc906 100644
--- a/spec/support/filter_spec_helper.rb
+++ b/spec/support/filter_spec_helper.rb
@@ -63,9 +63,9 @@ def reference_filter(html, context = {})
   #
   # Returns a String
   def invalidate_reference(reference)
-    if reference =~ /\A(.+)?.\d+\z/
+    if reference =~ /\A(.+)?[^\d]\d+\z/
       # Integer-based reference with optional project prefix
-      reference.gsub(/\d+\z/) { |i| i.to_i + 1 }
+      reference.gsub(/\d+\z/) { |i| i.to_i + 10_000 }
     elsif reference =~ /\A(.+@)?(\h{7,40}\z)/
       # SHA-based reference with optional prefix
       reference.gsub(/\h{7,40}\z/) { |v| v.reverse }
-- 
GitLab


From 58fe40fbd38dce5d42f5f36681780579fb3f031b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 24 Mar 2017 19:12:22 +0100
Subject: [PATCH 4/6] Don't use FFaker in factories, use sequences instead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 db/fixtures/development/18_abuse_reports.rb | 32 +++++++++++----------
 spec/factories/labels.rb                    | 11 +++----
 spec/factories/sequences.rb                 |  4 +--
 spec/requests/api/issues_spec.rb            |  6 ++--
 spec/requests/api/v3/issues_spec.rb         |  6 ++--
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/db/fixtures/development/18_abuse_reports.rb b/db/fixtures/development/18_abuse_reports.rb
index 7e67262b59ef..762fab5f0abf 100644
--- a/db/fixtures/development/18_abuse_reports.rb
+++ b/db/fixtures/development/18_abuse_reports.rb
@@ -1,20 +1,22 @@
 module Db
   module Fixtures
-    class Development
-      def self.seed
-        Gitlab::Seeder.quiet do
-          (AbuseReport.default_per_page + 3).times do
-            reported_user =
-              User.create!(
-                username: FFaker::Internet.user_name,
-                name: FFaker::Name.name,
-                email: FFaker::Internet.email,
-                confirmed_at: DateTime.now,
-                password: '12345678'
-              )
+    module Development
+      class AbuseReport
+        def self.seed
+          Gitlab::Seeder.quiet do
+            (::AbuseReport.default_per_page + 3).times do
+              reported_user =
+                ::User.create!(
+                  username: FFaker::Internet.user_name,
+                  name: FFaker::Name.name,
+                  email: FFaker::Internet.email,
+                  confirmed_at: DateTime.now,
+                  password: '12345678'
+                )
 
-            AbuseReport.create(reporter: User.take, user: reported_user, message: 'User sends spam')
-            print '.'
+              ::AbuseReport.create(reporter: ::User.take, user: reported_user, message: 'User sends spam')
+              print '.'
+            end
           end
         end
       end
@@ -22,4 +24,4 @@ def self.seed
   end
 end
 
-Db::Fixtures::Development.seed
+Db::Fixtures::Development::AbuseReport.seed
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index 5706ab6a7679..22c2a1f15e24 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -1,7 +1,10 @@
 FactoryGirl.define do
-  factory :label, class: ProjectLabel do
-    title { generate(:label) }
+  trait :base_label do
+    title { generate(:label_title) }
     color "#990000"
+  end
+
+  factory :label, traits: [:base_label], class: ProjectLabel do
     project factory: :empty_project
 
     transient do
@@ -15,9 +18,7 @@
     end
   end
 
-  factory :group_label, class: GroupLabel do
-    title { generate(:label) }
-    color "#990000"
+  factory :group_label, traits: [:base_label] do
     group
   end
 end
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
index 2321455bfeed..c0232ba5bf68 100644
--- a/spec/factories/sequences.rb
+++ b/spec/factories/sequences.rb
@@ -6,7 +6,7 @@
   sequence(:title) { |n| "My title #{n}" }
   sequence(:filename) { |n| "filename-#{n}.rb" }
   sequence(:url) { |n| "http://example#{n}.org" }
-  sequence(:label) { |n| "label#{n}" }
+  sequence(:label_title) { |n| "label#{n}" }
   sequence(:branch) { |n| "my-branch-#{n}" }
-  sequence(:issue_created_at) { |n| 4.hours.ago + (2 * n).seconds }
+  sequence(:past_time) { |n| 4.hours.ago + (2 * n).seconds }
 end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 91d6fb83c0b2..4729adba11cd 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -19,7 +19,7 @@
            project: project,
            state: :closed,
            milestone: milestone,
-           created_at: generate(:issue_created_at),
+           created_at: generate(:past_time),
            updated_at: 3.hours.ago
   end
   let!(:confidential_issue) do
@@ -28,7 +28,7 @@
            project: project,
            author: author,
            assignee: assignee,
-           created_at: generate(:issue_created_at),
+           created_at: generate(:past_time),
            updated_at: 2.hours.ago
   end
   let!(:issue) do
@@ -37,7 +37,7 @@
            assignee: user,
            project: project,
            milestone: milestone,
-           created_at: generate(:issue_created_at),
+           created_at: generate(:past_time),
            updated_at: 1.hour.ago
   end
   let!(:label) do
diff --git a/spec/requests/api/v3/issues_spec.rb b/spec/requests/api/v3/issues_spec.rb
index 383871d5c388..b1b398a897ef 100644
--- a/spec/requests/api/v3/issues_spec.rb
+++ b/spec/requests/api/v3/issues_spec.rb
@@ -19,7 +19,7 @@
            project: project,
            state: :closed,
            milestone: milestone,
-           created_at: generate(:issue_created_at),
+           created_at: generate(:past_time),
            updated_at: 3.hours.ago
   end
   let!(:confidential_issue) do
@@ -28,7 +28,7 @@
            project: project,
            author: author,
            assignee: assignee,
-           created_at: generate(:issue_created_at),
+           created_at: generate(:past_time),
            updated_at: 2.hours.ago
   end
   let!(:issue) do
@@ -37,7 +37,7 @@
            assignee: user,
            project: project,
            milestone: milestone,
-           created_at: generate(:issue_created_at),
+           created_at: generate(:past_time),
            updated_at: 1.hour.ago
   end
   let!(:label) do
-- 
GitLab


From 5388bb1cca501442be05ddf929fae7d1bfcbd1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 3 Apr 2017 18:51:29 +0200
Subject: [PATCH 5/6] Ensure the AbuseReport fixtures create unique reported
 users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 db/fixtures/development/18_abuse_reports.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/fixtures/development/18_abuse_reports.rb b/db/fixtures/development/18_abuse_reports.rb
index 762fab5f0abf..a3d33706d8e5 100644
--- a/db/fixtures/development/18_abuse_reports.rb
+++ b/db/fixtures/development/18_abuse_reports.rb
@@ -7,7 +7,7 @@ def self.seed
             (::AbuseReport.default_per_page + 3).times do
               reported_user =
                 ::User.create!(
-                  username: FFaker::Internet.user_name,
+                  username: "#{FFaker::Internet.user_name}-reported",
                   name: FFaker::Name.name,
                   email: FFaker::Internet.email,
                   confirmed_at: DateTime.now,
-- 
GitLab


From bf69e6291d7c7029c18f21a65abc2579e1825cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 3 Apr 2017 18:53:44 +0200
Subject: [PATCH 6/6] Ensure user has a unique username otherwise `user10`
 would match `user1`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/requests/api/members_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/api/members_spec.rb b/spec/requests/api/members_spec.rb
index 2d37d026a397..84dca51801f3 100644
--- a/spec/requests/api/members_spec.rb
+++ b/spec/requests/api/members_spec.rb
@@ -3,7 +3,7 @@
 describe API::Members, api: true  do
   include ApiHelpers
 
-  let(:master) { create(:user) }
+  let(:master) { create(:user, username: 'master_user') }
   let(:developer) { create(:user) }
   let(:access_requester) { create(:user) }
   let(:stranger) { create(:user) }
-- 
GitLab