summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2017-12-22 17:32:01 +0100
committerFrancisco Javier López <fjlopez@gitlab.com>2017-12-22 17:32:01 +0100
commit44d3764ffc683856326a32eae54d6a2204523dfa (patch)
tree44321111ff28af5a33d49fcb898dbd1ccd4bd317
parent0364637d7ae1055f3259786c88ca25317b39de16 (diff)
downloadgitlab-ce-fj-40053-error-500-members-list.tar.gz
Removing other factories from migration specfj-40053-error-500-members-list
-rw-r--r--spec/migrations/clean_up_for_members_spec.rb30
1 files changed, 24 insertions, 6 deletions
diff --git a/spec/migrations/clean_up_for_members_spec.rb b/spec/migrations/clean_up_for_members_spec.rb
index 6f788d70567..0258860d169 100644
--- a/spec/migrations/clean_up_for_members_spec.rb
+++ b/spec/migrations/clean_up_for_members_spec.rb
@@ -3,9 +3,6 @@ require Rails.root.join('db', 'migrate', '20171216111734_clean_up_for_members.rb
describe CleanUpForMembers, :migration do
let(:migration) { described_class.new }
- let(:member) { table(:members) }
- let(:project) { create(:project) }
- let(:group) { create(:group) }
let!(:group_member) { create_group_member }
let!(:unbinded_group_member) { create_group_member }
let!(:invited_group_member) { create_group_member(true) }
@@ -28,11 +25,11 @@ describe CleanUpForMembers, :migration do
end
def create_group_member(invited = false)
- fill_member(GroupMember.new(group: group), invited)
+ fill_member(GroupMember.new(group: create_group), invited)
end
def create_project_member(invited = false)
- fill_member(ProjectMember.new(project: project), invited)
+ fill_member(ProjectMember.new(project: create_project), invited)
end
def fill_member(member_object, invited)
@@ -54,7 +51,28 @@ describe CleanUpForMembers, :migration do
member_object
end
+ def create_group
+ name = FFaker::Lorem.characters(10)
+
+ Group.create(name: name, path: name.downcase.gsub(/\s/, '_'))
+ end
+
+ def create_project
+ name = FFaker::Lorem.characters(10)
+ creator = create_user
+
+ Project.create(name: name,
+ path: name.downcase.gsub(/\s/, '_'),
+ namespace: creator.namespace,
+ creator: creator)
+ end
+
def create_user
- create(:user)
+ User.create(email: FFaker::Internet.email,
+ password: '12345678',
+ name: FFaker::Name.name,
+ username: FFaker::Internet.user_name,
+ confirmed_at: Time.now,
+ confirmation_token: nil)
end
end