diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 21:09:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 21:09:32 +0300 |
| commit | 1268cfeaf73a73c5593f13639530513716826e2b (patch) | |
| tree | 2508ffb2fddaa666d99b4e5984d3340eb9194782 /spec/workers/gitlab/github_import | |
| parent | be769d5fcced48143e92f83c997b7d5ba14873e1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/gitlab/github_import')
3 files changed, 6 insertions, 0 deletions
diff --git a/spec/workers/gitlab/github_import/import_collaborator_worker_spec.rb b/spec/workers/gitlab/github_import/import_collaborator_worker_spec.rb index b9463fb9a2d..c8d3b66734c 100644 --- a/spec/workers/gitlab/github_import/import_collaborator_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_collaborator_worker_spec.rb @@ -15,6 +15,8 @@ RSpec.describe Gitlab::GithubImport::ImportCollaboratorWorker, feature_category: let(:importer) { instance_double('Gitlab::GithubImport::Importer::NoteAttachmentsImporter') } it 'imports a collaborator' do + allow(import_state).to receive(:in_progress?).and_return(true) + expect(Gitlab::GithubImport::Importer::CollaboratorImporter) .to receive(:new) .with( 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 index d6e8f760033..8097f9d840a 100644 --- a/spec/workers/gitlab/github_import/import_protected_branch_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_protected_branch_worker_spec.rb @@ -20,6 +20,8 @@ RSpec.describe Gitlab::GithubImport::ImportProtectedBranchWorker, feature_catego end it 'imports protected branch rule' do + allow(import_state).to receive(:in_progress?).and_return(true) + expect(Gitlab::GithubImport::Importer::ProtectedBranchImporter) .to receive(:new) .with( diff --git a/spec/workers/gitlab/github_import/pull_requests/import_review_request_worker_spec.rb b/spec/workers/gitlab/github_import/pull_requests/import_review_request_worker_spec.rb index 99ed83ae2db..4c9e0fd618e 100644 --- a/spec/workers/gitlab/github_import/pull_requests/import_review_request_worker_spec.rb +++ b/spec/workers/gitlab/github_import/pull_requests/import_review_request_worker_spec.rb @@ -26,6 +26,8 @@ RSpec.describe Gitlab::GithubImport::PullRequests::ImportReviewRequestWorker, fe end it 'imports an pull request review requests' do + allow(import_state).to receive(:in_progress?).and_return(true) + expect(Gitlab::GithubImport::Importer::PullRequests::ReviewRequestImporter) .to receive(:new) .with( |