diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-14 15:12:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-14 15:12:34 +0300 |
commit | 16daf112d6cfe2c87d8837382a00d88aa8c0ff5c (patch) | |
tree | 017d43acafea2928550fe7c8fdbb7cf36335ba9f /spec/workers/gitlab/github_import | |
parent | 3cb798d80b6b5235b5f5febaaacef410e75c2963 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/gitlab/github_import')
3 files changed, 101 insertions, 2 deletions
diff --git a/spec/workers/gitlab/github_import/import_protected_branch_worker_spec.rb b/spec/workers/gitlab/github_import/import_protected_branch_worker_spec.rb new file mode 100644 index 00000000000..4a3ef2bf560 --- /dev/null +++ b/spec/workers/gitlab/github_import/import_protected_branch_worker_spec.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::GithubImport::ImportProtectedBranchWorker do + let(:worker) { described_class.new } + + let(:import_state) { build_stubbed(:import_state, :started) } + let(:project) { instance_double('Project', full_path: 'foo/bar', id: 1, import_state: import_state) } + let(:client) { instance_double('Gitlab::GithubImport::Client') } + let(:importer) { instance_double('Gitlab::GithubImport::Importer::ProtectedBranchImporter') } + + describe '#import' do + let(:json_hash) do + { + id: 'main', + allow_force_pushes: true + } + end + + it 'imports protected branch rule' do + expect(Gitlab::GithubImport::Importer::ProtectedBranchImporter) + .to receive(:new) + .with( + an_instance_of(Gitlab::GithubImport::Representation::ProtectedBranch), + project, + client + ) + .and_return(importer) + + expect(importer).to receive(:execute) + + expect(Gitlab::GithubImport::ObjectCounter) + .to receive(:increment) + .with(project, :protected_branch, :imported) + + worker.import(project, client, json_hash) + end + end +end diff --git a/spec/workers/gitlab/github_import/stage/import_attachments_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_attachments_worker_spec.rb index afed0debd90..c2c5e1dbf4e 100644 --- a/spec/workers/gitlab/github_import/stage/import_attachments_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/import_attachments_worker_spec.rb @@ -29,7 +29,7 @@ RSpec.describe Gitlab::GithubImport::Stage::ImportAttachmentsWorker do expect(Gitlab::GithubImport::AdvanceStageWorker) .to receive(:perform_async) - .with(project.id, { '123' => 2 }, :lfs_objects) + .with(project.id, { '123' => 2 }, :protected_branches) worker.import(client, project) end @@ -39,7 +39,8 @@ RSpec.describe Gitlab::GithubImport::Stage::ImportAttachmentsWorker do it 'skips release attachments import and calls next stage' do expect(Gitlab::GithubImport::Importer::ReleasesAttachmentsImporter).not_to receive(:new) - expect(Gitlab::GithubImport::AdvanceStageWorker).to receive(:perform_async).with(project.id, {}, :lfs_objects) + expect(Gitlab::GithubImport::AdvanceStageWorker) + .to receive(:perform_async).with(project.id, {}, :protected_branches) worker.import(client, project) end diff --git a/spec/workers/gitlab/github_import/stage/import_protected_branches_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_protected_branches_worker_spec.rb new file mode 100644 index 00000000000..0770af524a1 --- /dev/null +++ b/spec/workers/gitlab/github_import/stage/import_protected_branches_worker_spec.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::GithubImport::Stage::ImportProtectedBranchesWorker do + let_it_be(:project) { create(:project) } + let_it_be(:import_state) { create(:import_state, project: project) } + + let(:worker) { described_class.new } + let(:importer) { instance_double('Gitlab::GithubImport::Importer::ProtectedBranchImporter') } + let(:client) { instance_double('Gitlab::GithubImport::Client') } + + describe '#import' do + it 'imports all the pull requests' do + waiter = Gitlab::JobWaiter.new(2, '123') + + expect(Gitlab::GithubImport::Importer::ProtectedBranchesImporter) + .to receive(:new) + .with(project, client) + .and_return(importer) + + expect(importer) + .to receive(:execute) + .and_return(waiter) + + expect(import_state) + .to receive(:refresh_jid_expiration) + + expect(Gitlab::GithubImport::AdvanceStageWorker) + .to receive(:perform_async) + .with(project.id, { '123' => 2 }, :lfs_objects) + + worker.import(client, project) + end + + context 'when an error raised' do + let(:exception) { StandardError.new('_some_error_') } + + before do + allow_next_instance_of(Gitlab::GithubImport::Importer::ProtectedBranchesImporter) do |importer| + allow(importer).to receive(:execute).and_raise(exception) + end + end + + it 'raises an error' do + expect(Gitlab::Import::ImportFailureService).to receive(:track) + .with( + project_id: project.id, + exception: exception, + error_source: described_class.name, + metrics: true + ).and_call_original + + expect { worker.import(client, project) }.to raise_error(StandardError) + end + end + end +end |