summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-04 08:48:49 +0200
committerRémy Coutable <remy@rymai.me>2017-04-04 08:48:49 +0200
commitd7e3fadb42e00f680034a70735bcea21b9f74dca (patch)
treea3b99edb7f5e9a4872f39548bfa1ba03f0c52070
parentfa65b65b0f5e7095e2ec7c4ca0c269a4fe4baab1 (diff)
downloadgitlab-ce-rc/fix-transient-failures-following-no-ffaker.tar.gz
Ensure we generate unique usernames otherwise validations failrc/fix-transient-failures-following-no-ffaker
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--db/fixtures/development/18_abuse_reports.rb4
-rw-r--r--spec/requests/api/v3/members_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/db/fixtures/development/18_abuse_reports.rb b/db/fixtures/development/18_abuse_reports.rb
index a3d33706d8e..88d2f784852 100644
--- a/db/fixtures/development/18_abuse_reports.rb
+++ b/db/fixtures/development/18_abuse_reports.rb
@@ -4,10 +4,10 @@ module Db
class AbuseReport
def self.seed
Gitlab::Seeder.quiet do
- (::AbuseReport.default_per_page + 3).times do
+ (::AbuseReport.default_per_page + 3).times do |i|
reported_user =
::User.create!(
- username: "#{FFaker::Internet.user_name}-reported",
+ username: "reported_user_#{i}",
name: FFaker::Name.name,
email: FFaker::Internet.email,
confirmed_at: DateTime.now,
diff --git a/spec/requests/api/v3/members_spec.rb b/spec/requests/api/v3/members_spec.rb
index 13814ed10c3..af1c5cff67f 100644
--- a/spec/requests/api/v3/members_spec.rb
+++ b/spec/requests/api/v3/members_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe API::V3::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) }