diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb
index a39e7ac028caed055437fb2baba3cae649aa610f..ae4c0550a4f8fcfc4d022b5d9fcb1248417295e3 100644
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
@@ -1,48 +1,52 @@
-Gitlab::Seeder.quiet do
- project_urls = [
- 'https://github.com/documentcloud/underscore.git',
- 'https://gitlab.com/gitlab-org/gitlab-ce.git',
- 'https://gitlab.com/gitlab-org/gitlab-ci.git',
- 'https://gitlab.com/gitlab-org/gitlab-shell.git',
- 'https://gitlab.com/gitlab-org/gitlab-test.git',
- 'https://github.com/twitter/flight.git',
- 'https://github.com/twitter/typeahead.js.git',
- 'https://github.com/h5bp/html5-boilerplate.git',
- ]
-
- project_urls.each do |url|
- group_path, project_path = url.split('/')[-2..-1]
-
- group = Group.find_by(path: group_path)
-
- unless group
- group = Group.new(
- name: group_path.titleize,
- path: group_path
- )
- group.description = Faker::Lorem.sentence
- group.save
-
- group.add_owner(User.first)
- end
-
- project_path.gsub!('.git', '')
-
- params = {
- import_url: url,
- namespace_id: group.id,
- name: project_path.titleize,
- description: Faker::Lorem.sentence,
- visibility_level: Gitlab::VisibilityLevel.values.sample
- }
-
- project = Projects::CreateService.new(User.first, params).execute
-
- if project.valid?
- print '.'
- else
- puts project.errors.full_messages
- print 'F'
+require 'sidekiq/testing'
+
+Sidekiq::Testing.inline! do
+ Gitlab::Seeder.quiet do
+ project_urls = [
+ 'https://github.com/documentcloud/underscore.git',
+ 'https://gitlab.com/gitlab-org/gitlab-ce.git',
+ 'https://gitlab.com/gitlab-org/gitlab-ci.git',
+ 'https://gitlab.com/gitlab-org/gitlab-shell.git',
+ 'https://gitlab.com/gitlab-org/gitlab-test.git',
+ 'https://github.com/twitter/flight.git',
+ 'https://github.com/twitter/typeahead.js.git',
+ 'https://github.com/h5bp/html5-boilerplate.git',
+ ]
+
+ project_urls.each_with_index do |url, i|
+ group_path, project_path = url.split('/')[-2..-1]
+
+ group = Group.find_by(path: group_path)
+
+ unless group
+ group = Group.new(
+ name: group_path.titleize,
+ path: group_path
+ )
+ group.description = Faker::Lorem.sentence
+ group.save
+
+ group.add_owner(User.first)
+ end
+
+ project_path.gsub!(".git", "")
+
+ params = {
+ import_url: url,
+ namespace_id: group.id,
+ name: project_path.titleize,
+ description: Faker::Lorem.sentence,
+ visibility_level: Gitlab::VisibilityLevel.values.sample
+ }
+
+ project = Projects::CreateService.new(User.first, params).execute
+
+ if project.valid?
+ print '.'
+ else
+ puts project.errors.full_messages
+ print 'F'
+ end
end
end
end
diff --git a/db/fixtures/development/08_milestones.rb b/db/fixtures/development/07_milestones.rb
similarity index 100%
rename from db/fixtures/development/08_milestones.rb
rename to db/fixtures/development/07_milestones.rb
diff --git a/db/fixtures/development/07_projects_visibility.rb b/db/fixtures/development/07_projects_visibility.rb
deleted file mode 100644
index c3287584a07da2b249e984282c0e80261bd45919..0000000000000000000000000000000000000000
--- a/db/fixtures/development/07_projects_visibility.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require Rails.root.join('db', 'fixtures', Rails.env, 'fixtures_development_helper')
-
-Gitlab::Seeder.quiet do
- Gitlab::VisibilityLevel.options.each do |visibility_label, visibility_value|
- visibility_label_downcase = visibility_label.downcase
- begin
- user = User.seed(:username) do |s|
- username = "#{visibility_label_downcase}-owner"
- s.username = username
- s.name = "#{visibility_label} Owner"
- s.email = "#{username}@example.com"
- s.password = '12345678'
- s.confirmed_at = DateTime.now
- end[0]
-
- # import_url does not work for local paths,
- # so we just copy the template repository in.
- unless Project.find_with_namespace("#{user.namespace.id}/"\
- "#{visibility_label_downcase}")
- params = {
- name: "#{visibility_label} Project",
- description: "#{visibility_label} Project description",
- namespace_id: user.namespace.id,
- visibility_level: visibility_value,
- }
- project = Projects::CreateService.new(user, params).execute
- new_path = project.repository.path
- FileUtils.rm_rf(new_path)
- FileUtils.cp_r(FixturesDevelopmentHelper.template_project.repository.path,
- new_path)
- end
-
- print '.'
- rescue ActiveRecord::RecordNotSaved
- print 'F'
- end
- end
-end
diff --git a/db/fixtures/development/fixtures_development_helper.rb b/db/fixtures/development/fixtures_development_helper.rb
deleted file mode 100644
index 22a7834bbee3bb166f0f9a1923358c7775dd584e..0000000000000000000000000000000000000000
--- a/db/fixtures/development/fixtures_development_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module FixturesDevelopmentHelper
- class << self
- def template_project
- @template_project ||= Project.
- find_with_namespace('gitlab-org/gitlab-test')
- end
- end
-end
diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb
index e816eedab9ea4d8bb46dbb61a7c7b2b4af373e4c..31aa3528c4c37a4aa4416da61e6d0df01368b9c0 100644
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
@@ -1,13 +1,9 @@
-require 'sidekiq/testing'
-
module Gitlab
class Seeder
def self.quiet
mute_mailer
SeedFu.quiet = true
- Sidekiq::Testing.inline! do
- yield
- end
+ yield
SeedFu.quiet = false
puts "\nOK".green
end