Merge branch 'improve-dev-seeds' into 'master'

Improve dev seeds

2 files changed, 31 insertions, 42 deletions

diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb
index 9303ab93300..164bb637809 100644
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
@@ -40,7 +40,8 @@ Gitlab::Seeder.quiet do
       import_url: url,
       namespace_id: group.id,
       name: project_path.titleize,
-      description: Faker::Lorem.sentence
+      description: Faker::Lorem.sentence,
+      visibility_level: Gitlab::VisibilityLevel.values.sample
     }
 
     project = Projects::CreateService.new(User.first, params).execute
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index cb08a7c2537..62fd0d84ea3 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -1,45 +1,33 @@
 Gitlab::Seeder.quiet do
-  (1..100).each  do |i|
-    # Random Project
-    project = Project.all.sample
-
-    # Random user
-    user = project.team.users.sample
-
-    next unless user
-
-    next if project.empty_repo?
-
-    branches = project.repository.branch_names.sample(2)
-
-    next if branches.uniq.size < 2
-
-    user_id = user.id
-
-    Gitlab::Seeder.by_user(user) do
-      MergeRequest.seed(:id, [{
-        id: i,
-        source_branch: branches.first,
-        target_branch: branches.last,
-        source_project_id: project.id,
-        target_project_id: project.id,
-        author_id: user_id,
-        assignee_id: user_id,
-        milestone: project.milestones.sample,
-        title: Faker::Lorem.sentence(6)
-      }])
+  Project.all.reject(&:empty_repo?).each do |project|
+    branches = project.repository.branch_names
+
+    branches.each do |branch_name|
+      break if branches.size < 2
+      source_branch = branches.pop
+      target_branch = branches.pop
+
+      # Random user
+      user = project.team.users.sample
+      next unless user
+
+      params = {
+        source_branch: source_branch,
+        target_branch: target_branch,
+        title: Faker::Lorem.sentence(6),
+        description: Faker::Lorem.sentences(3).join(" ")
+      }
+
+      merge_request = MergeRequests::CreateService.new(project, user, params).execute
+
+      if merge_request.valid?
+        merge_request.assignee = user
+        merge_request.milestone = project.milestones.sample
+        merge_request.save
+        print '.'
+      else
+        print 'F'
+      end
     end
-    print('.')
   end
 end
-
-MergeRequest.all.map do |mr|
-  mr.set_iid
-  mr.save
-end
-
-puts 'Load diffs for Merge Requests (it will take some time)...'
-MergeRequest.all.each do |mr|
-  mr.reload_code
-  print '.'
-end