kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

review: normalize shared initizlier arguments

Browse source
This commit is contained in:
Travis Miller 2018-02-24 22:43:16 -06:00
parent b1e3237677
commit 737b7e3e7d
15 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/gitlab/import_export/shared.rb
View file

@ -1,10 +1,11 @@
module Gitlab
module ImportExport
class Shared
attr_reader :errors, :project
attr_reader :errors, :project, :opts
def initialize(project)
def initialize(project, opts = {})
@project = project
@opts = opts
@errors = []
end
@ -39,10 +40,10 @@ module Gitlab
end
def relative_archive_path
if @project.is_a?(Project)
@project.disk_path
if @opts[:relative_path]
@opts[:relative_path]
else
@project[:relative_path]
@project.disk_path
end
end

2
spec/lib/gitlab/import_export/avatar_restorer_spec.rb
View file

@ -3,7 +3,7 @@ require 'spec_helper'
describe Gitlab::ImportExport::AvatarRestorer do
include UploadHelpers
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: 'test') }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:project) { create(:project) }
before do

2
spec/lib/gitlab/import_export/avatar_saver_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe Gitlab::ImportExport::AvatarSaver do
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: 'test') }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:project_with_avatar) { create(:project, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
let(:project) { create(:project) }

2
spec/lib/gitlab/import_export/file_importer_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe Gitlab::ImportExport::FileImporter do
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: 'test') }
let(:shared) { Gitlab::ImportExport::Shared.new(nil, relative_path: 'test') }
let(:export_path) { "#{Dir.tmpdir}/file_importer_spec" }
let(:valid_file) { "#{shared.export_path}/valid.json" }
let(:symlink_file) { "#{shared.export_path}/invalid.json" }

2
spec/lib/gitlab/import_export/fork_spec.rb
View file

@ -7,7 +7,7 @@ describe 'forked project import' do
let!(:project_with_repo) { create(:project, :repository, name: 'test-repo-restorer', path: 'test-repo-restorer') }
let!(:project) { create(:project, name: 'test-repo-restorer-no-repo', path: 'test-repo-restorer-no-repo') }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:forked_from_project) { create(:project, :repository) }
let(:forked_project) { fork_project(project_with_repo, nil, repository: true) }
let(:repo_saver) { Gitlab::ImportExport::RepoSaver.new(project: project_with_repo, shared: shared) }

2
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
View file

@ -7,7 +7,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
@user = create(:user)
RSpec::Mocks.with_temporary_scope do
@shared = Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path')
@shared = Gitlab::ImportExport::Shared.new(@project)
allow(@shared).to receive(:export_path).and_return('spec/lib/gitlab/import_export/')
@project = create(:project, :builds_disabled, :issues_disabled, name: 'project', path: 'project')

2
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
View file

@ -2,7 +2,7 @@ require 'spec_helper'
describe Gitlab::ImportExport::ProjectTreeSaver do
describe 'saves the project tree into a json object' do
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:project_tree_saver) { described_class.new(project: project, current_user: user, shared: shared) }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:user) { create(:user) }

2
spec/lib/gitlab/import_export/reader_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe Gitlab::ImportExport::Reader do
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: '') }
let(:shared) { Gitlab::ImportExport::Shared.new(nil) }
let(:test_config) { 'spec/support/import_export/import_export.yml' }
let(:project_tree_hash) do
{

2
spec/lib/gitlab/import_export/repo_restorer_spec.rb
View file

@ -6,7 +6,7 @@ describe Gitlab::ImportExport::RepoRestorer do
let!(:project_with_repo) { create(:project, :repository, name: 'test-repo-restorer', path: 'test-repo-restorer') }
let!(:project) { create(:project) }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:bundler) { Gitlab::ImportExport::RepoSaver.new(project: project_with_repo, shared: shared) }
let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
let(:restorer) do

2
spec/lib/gitlab/import_export/repo_saver_spec.rb
View file

@ -5,7 +5,7 @@ describe Gitlab::ImportExport::RepoSaver do
let(:user) { create(:user) }
let!(:project) { create(:project, :public, name: 'searchable_project') }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:bundler) { described_class.new(project: project, shared: shared) }
before do

2
spec/lib/gitlab/import_export/uploads_restorer_spec.rb
View file

@ -3,7 +3,7 @@ require 'spec_helper'
describe Gitlab::ImportExport::UploadsRestorer do
describe 'bundle a project Git repo' do
let(:export_path) { "#{Dir.tmpdir}/uploads_saver_spec" }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
before do
allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)

2
spec/lib/gitlab/import_export/uploads_saver_spec.rb
View file

@ -4,7 +4,7 @@ describe Gitlab::ImportExport::UploadsSaver do
describe 'bundle a project Git repo' do
let(:export_path) { "#{Dir.tmpdir}/uploads_saver_spec" }
let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
before do
allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)

2
spec/lib/gitlab/import_export/version_checker_spec.rb
View file

@ -2,7 +2,7 @@ require 'spec_helper'
include ImportExport::CommonUtil
describe Gitlab::ImportExport::VersionChecker do
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: '') }
let(:shared) { Gitlab::ImportExport::Shared.new(nil, relative_path: '') }
describe 'bundle a project Git repo' do
let(:version) { Gitlab::ImportExport.version }

2
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
View file

@ -5,7 +5,7 @@ describe Gitlab::ImportExport::WikiRepoSaver do
let(:user) { create(:user) }
let!(:project) { create(:project, :public, name: 'searchable_project') }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:wiki_bundler) { described_class.new(project: project, shared: shared) }
let!(:project_wiki) { ProjectWiki.new(project, user) }

2
spec/lib/gitlab/import_export/wiki_restorer_spec.rb
View file

@ -6,7 +6,7 @@ describe Gitlab::ImportExport::WikiRestorer do
let!(:project_without_wiki) { create(:project) }
let!(:project) { create(:project) }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
let(:shared) { Gitlab::ImportExport::Shared.new(project) }
let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(project: project_with_wiki, shared: shared) }
let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
let(:restorer) do