maxmustermann/gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'georgekoltsov/add-protected-branches-to-project-migration' into 'master'

Browse source 
Add protected branches to Project Migration

See merge request gitlab-org/gitlab!73998
This commit is contained in:
Douglas Barbosa Alexandre 2021-11-10 19:53:16 +00:00
parent f8af9adc58 f98abb317b
commit 14c1426bb8
6 changed files with 120 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ee/spec/lib/bulk_imports/projects/pipelines/protected_branches_pipeline_spec.rb Normal file
View file

@ -0,0 +1,37 @@
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe BulkImports::Projects::Pipelines::ProtectedBranchesPipeline do
let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project) }
let_it_be(:bulk_import) { create(:bulk_import, user: user) }
let_it_be(:entity) { create(:bulk_import_entity, :project_entity, project: project, bulk_import: bulk_import) }
let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) }
let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) }
let_it_be(:protected_branch) do
{
'name' => 'main',
'created_at' => '2016-06-14T15:02:47.967Z',
'updated_at' => '2016-06-14T15:02:47.967Z',
'unprotect_access_levels' => [{ 'access_level' => 0 }]
}
end
subject(:pipeline) { described_class.new(context) }
describe '#run' do
it 'imports protected branch information with unprotect access levels' do
allow_next_instance_of(BulkImports::Common::Extractors::NdjsonExtractor) do |extractor|
allow(extractor).to receive(:extract).and_return(BulkImports::Pipeline::ExtractedData.new(data: [protected_branch, 0]))
end
pipeline.run
imported_protected_branch = project.protected_branches.last
unprotect_access_level = imported_protected_branch.unprotect_access_levels.first
expect(unprotect_access_level.access_level).to eq(protected_branch['unprotect_access_levels'].first['access_level'])
end
end
end

1
ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb
View file

@ -14,6 +14,7 @@
[4, BulkImports::Projects::Pipelines::MergeRequestsPipeline],
[4, BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline],
[4, BulkImports::Projects::Pipelines::PushRulePipeline],
[4, BulkImports::Projects::Pipelines::ProtectedBranchesPipeline],
[5, BulkImports::Common::Pipelines::WikiPipeline],
[5, BulkImports::Common::Pipelines::UploadsPipeline],
[6, BulkImports::Common::Pipelines::EntityFinisher]

15
lib/bulk_imports/projects/pipelines/protected_branches_pipeline.rb Normal file
View file

@ -0,0 +1,15 @@
# frozen_string_literal: true
module BulkImports
module Projects
module Pipelines
class ProtectedBranchesPipeline
include NdjsonPipeline
relation_name 'protected_branches'
extractor ::BulkImports::Common::Extractors::NdjsonExtractor, relation: relation
end
end
end
end

4
lib/bulk_imports/projects/stage.rb
View file

@ -39,6 +39,10 @@ def config
pipeline: BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline,
stage: 4
},
protected_branches: {
pipeline: BulkImports::Projects::Pipelines::ProtectedBranchesPipeline,
stage: 4
},
wiki: {
pipeline: BulkImports::Common::Pipelines::WikiPipeline,
stage: 5

61
spec/lib/bulk_imports/projects/pipelines/protected_branches_pipeline_spec.rb Normal file
View file

@ -0,0 +1,61 @@
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe BulkImports::Projects::Pipelines::ProtectedBranchesPipeline do
let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project) }
let_it_be(:bulk_import) { create(:bulk_import, user: user) }
let_it_be(:entity) { create(:bulk_import_entity, :project_entity, project: project, bulk_import: bulk_import) }
let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) }
let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) }
let_it_be(:protected_branch) do
{
'name' => 'main',
'created_at' => '2016-06-14T15:02:47.967Z',
'updated_at' => '2016-06-14T15:02:47.967Z',
'merge_access_levels' => [
{
'access_level' => 40,
'created_at' => '2016-06-15T15:02:47.967Z',
'updated_at' => '2016-06-15T15:02:47.967Z'
}
],
'push_access_levels' => [
{
'access_level' => 30,
'created_at' => '2016-06-16T15:02:47.967Z',
'updated_at' => '2016-06-16T15:02:47.967Z'
}
]
}
end
subject(:pipeline) { described_class.new(context) }
describe '#run' do
it 'imports protected branch information' do
allow_next_instance_of(BulkImports::Common::Extractors::NdjsonExtractor) do |extractor|
allow(extractor).to receive(:extract).and_return(BulkImports::Pipeline::ExtractedData.new(data: [protected_branch, 0]))
end
pipeline.run
imported_protected_branch = project.protected_branches.last
merge_access_level = imported_protected_branch.merge_access_levels.first
push_access_level = imported_protected_branch.push_access_levels.first
aggregate_failures do
expect(imported_protected_branch.name).to eq(protected_branch['name'])
expect(imported_protected_branch.updated_at).to eq(protected_branch['updated_at'])
expect(imported_protected_branch.created_at).to eq(protected_branch['created_at'])
expect(merge_access_level.access_level).to eq(protected_branch['merge_access_levels'].first['access_level'])
expect(merge_access_level.created_at).to eq(protected_branch['merge_access_levels'].first['created_at'])
expect(merge_access_level.updated_at).to eq(protected_branch['merge_access_levels'].first['updated_at'])
expect(push_access_level.access_level).to eq(protected_branch['push_access_levels'].first['access_level'])
expect(push_access_level.created_at).to eq(protected_branch['push_access_levels'].first['created_at'])
expect(push_access_level.updated_at).to eq(protected_branch['push_access_levels'].first['updated_at'])
end
end
end
end

3
spec/lib/bulk_imports/projects/stage_spec.rb
View file

@ -13,6 +13,7 @@
[4, BulkImports::Common::Pipelines::BoardsPipeline],
[4, BulkImports::Projects::Pipelines::MergeRequestsPipeline],
[4, BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline],
[4, BulkImports::Projects::Pipelines::ProtectedBranchesPipeline],
[5, BulkImports::Common::Pipelines::WikiPipeline],
[5, BulkImports::Common::Pipelines::UploadsPipeline],
[6, BulkImports::Common::Pipelines::EntityFinisher]
@ -27,7 +28,7 @@
describe '#pipelines' do
it 'list all the pipelines with their stage number, ordered by stage' do
expect(subject.pipelines & pipelines).to eq(pipelines)
expect(subject.pipelines & pipelines).to contain_exactly(*pipelines)
expect(subject.pipelines.last.last).to eq(BulkImports::Common::Pipelines::EntityFinisher)
end
end