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

app/services/projects/create_service.rb

@@ -57,7 +57,6 @@ module Projects
             :add_repository,
             @project.path_with_namespace
           )
-
         end
 
         if @project.wiki_enabled?

db/fixtures/development/01_admin.rb

-User.seed(:id, [
-  {
-    id: 1,
-    name: "Administrator",
-    email: "admin@example.com",
-    username: 'root',
-    password: "5iveL!fe",
-    password_confirmation: "5iveL!fe",
-    admin: true,
-    projects_limit: 100,
-    theme_id: Gitlab::Theme::MARS,
-    confirmed_at: DateTime.now
-  }
-])
+User.seed do |s|
+  s.id = 1
+  s.name = "Administrator"
+  s.email = "admin@example.com"
+  s.username = 'root'
+  s.password = "5iveL!fe"
+  s.password_confirmation = "5iveL!fe"
+  s.admin = true
+  s.projects_limit = 100
+  s.confirmed_at = DateTime.now
+end

db/fixtures/development/04_project.rb

-Gitlab::Seeder.quiet do
+require 'sidekiq/testing'
+
+Sidekiq::Testing.inline! do
+  Gitlab::Seeder.quiet do
     project_urls = [
       'https://github.com/documentcloud/underscore.git',
-    'https://github.com/diaspora/diaspora.git',
-    'https://github.com/diaspora/diaspora-project-site.git',
-    'https://github.com/diaspora/diaspora-client.git',
-    'https://github.com/brightbox/brightbox-cli.git',
-    'https://github.com/brightbox/puppet.git',
       'https://github.com/gitlabhq/gitlabhq.git',
       'https://github.com/gitlabhq/gitlab-ci.git',
-    'https://github.com/gitlabhq/gitlab-recipes.git',
       'https://github.com/gitlabhq/gitlab-shell.git',
-    'https://github.com/gitlabhq/grack.git',
       'https://github.com/gitlabhq/testme.git',
       'https://github.com/twitter/flight.git',
       'https://github.com/twitter/typeahead.js.git',
       'https://github.com/h5bp/html5-boilerplate.git',
-    'https://github.com/h5bp/mobile-boilerplate.git',
     ]
 
     project_urls.each_with_index do |url, i|
@@ -53,4 +48,5 @@ Gitlab::Seeder.quiet do
         print 'F'
       end
     end
+  end
 end

db/fixtures/development/05_users.rb

 Gitlab::Seeder.quiet do
-  (2..10).each  do |i|
+  (2..20).each  do |i|
     begin
       User.seed(:id, [{
         id: i,

db/fixtures/development/07_milestones.rb

-Milestone.seed(:id, [
-  { id: 1,  project_id: 1, title: 'v' + Faker::Address.zip_code },
-  { id: 2,  project_id: 1, title: 'v' + Faker::Address.zip_code },
-  { id: 3,  project_id: 1, title: 'v' + Faker::Address.zip_code },
-  { id: 4,  project_id: 2, title: 'v' + Faker::Address.zip_code },
-  { id: 5,  project_id: 2, title: 'v' + Faker::Address.zip_code },
+Gitlab::Seeder.quiet do
+  Project.all.each do |project|
+    (1..5).each  do |i|
+      milestone_params = {
+        title: "v#{i}.0",
+        description: Faker::Lorem.sentence,
+        state: ['opened', 'closed'].sample,
+      }
 
-  { id: 6,  project_id: 2, title: 'v' + Faker::Address.zip_code },
-  { id: 7,  project_id: 2, title: 'v' + Faker::Address.zip_code },
-  { id: 8,  project_id: 3, title: 'v' + Faker::Address.zip_code },
-  { id: 9,  project_id: 3, title: 'v' + Faker::Address.zip_code },
-  { id: 11, project_id: 3, title: 'v' + Faker::Address.zip_code },
-])
+      milestone = Milestones::CreateService.new(
+        project, project.team.users.sample, milestone_params).execute
 
-Milestone.all.map do |ml|
-  ml.set_iid
-  ml.save
+      print '.'
+    end
+  end
 end

db/fixtures/development/08_wall.rb

-Gitlab::Seeder.quiet do
-  (1..300).each  do |i|
-    # Random Project
-    project = Project.all.sample
-
-    # Random user
-    user = project.users.sample
-
-    next unless user
-
-    user_id = user.id
-
-    Note.seed(:id, [{
-      id: i,
-      project_id: project.id,
-      author_id: user_id,
-      note: Faker::Lorem.sentence(6)
-    }])
-    print('.')
-  end
-end

db/fixtures/development/09_issues.rb

 Gitlab::Seeder.quiet do
-  (1..300).each  do |i|
-    # Random Project
-    project = Project.all.sample
-
-    # Random user
-    user = project.team.users.sample
-
-    next unless user
-
-    user_id = user.id
-
-    Gitlab::Seeder.by_user(user) do
-      Issue.seed(:id, [{
-        id: i,
-        project_id: project.id,
-        author_id: user_id,
-        assignee_id: user_id,
+  Project.all.each do |project|
+    (1..10).each  do |i|
+      issue_params = {
+        title: Faker::Lorem.sentence(6),
+        description: Faker::Lorem.sentence,
         state: ['opened', 'closed'].sample,
         milestone: project.milestones.sample,
-        title: Faker::Lorem.sentence(6),
-        description: Faker::Lorem.sentence
-      }])
-    end
-    print('.')
-  end
+        assignee: project.team.users.sample
+      }
 
-  Issue.all.map do |issue|
-    issue.set_iid
-    issue.save
+      Issues::CreateService.new(project, project.team.users.sample, issue_params).execute
+      print '.'
+    end
   end
 end

db/fixtures/development/10_merge_requests.rb

@@ -7,27 +7,17 @@ Gitlab::Seeder.quiet do
       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(" ")
+        description: Faker::Lorem.sentences(3).join(" "),
+        milestone: project.milestones.sample,
+        assignee: project.team.users.sample
       }
 
-      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
+      MergeRequests::CreateService.new(project, project.team.users.sample, params).execute
       print '.'
-      else
-        print 'F'
-      end
     end
   end
 end

db/fixtures/development/11_keys.rb

 Gitlab::Seeder.quiet do
-  User.first(30).each_with_index do |user, i|
-    Key.seed(:id, [
-      {
-        id: i + 1,
-        title: "Sample key #{i}",
-        key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt#{i + 100}6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
-        user_id: user.id,
-      }
-    ])
-    puts "SSH KEY ##{i} added.".green
+  User.first(10).each do |user|
+    key = "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt#{user.id + 100}6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
+
+    user.keys.create(
+      title: "Sample key #{user.id}",
+      key: key
+    )
+
+    print '.'
   end
 end

db/fixtures/development/13_comments.rb

 Gitlab::Seeder.quiet do
-  Issue.all.limit(10).each_with_index do |issue, i|
-    5.times do
-      user = issue.project.team.users.sample
+  Issue.all.each do |issue|
+    project = issue.project
 
-      Gitlab::Seeder.by_user(user) do
-        Note.seed(:id, [{
-          project_id: issue.project.id,
-          author_id: user.id,
-          note: Faker::Lorem.sentence,
+    project.team.users.each do |user|
+      note_params = {
+        noteable_type: 'Issue',
         noteable_id: issue.id,
-          noteable_type: 'Issue'
-        }])
+        note: Faker::Lorem.sentence,
+      }
 
+      Notes::CreateService.new(project, user, note_params).execute
       print '.'
     end
   end
+
+  MergeRequest.all.each do |mr|
+    project = mr.project
+
+    project.team.users.each do |user|
+      note_params = {
+        noteable_type: 'MergeRequest',
+        noteable_id: mr.id,
+        note: Faker::Lorem.sentence,
+      }
+
+      Notes::CreateService.new(project, user, note_params).execute
+      print '.'
+    end
   end
 end