Add latest changes from gitlab-org/gitlab@master

5 files changed, 96 insertions, 6 deletions

diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
index 7d11957e2df..ddf29d7b081 100644
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -3,11 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe EmailsOnPushWorker, :mailer do
-  include RepoHelpers
   include EmailSpec::Matchers
 
-  let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+
   let(:data) { Gitlab::DataBuilder::Push.build_sample(project, user) }
   let(:recipients) { user.email }
   let(:perform) { subject.perform(project.id, recipients, data.stringify_keys) }
@@ -91,7 +91,7 @@ RSpec.describe EmailsOnPushWorker, :mailer do
 
     context "when there is an SMTP error" do
       before do
-        allow(Notify).to receive(:repository_push_email).and_raise(Net::SMTPFatalError)
+        allow(Notify).to receive(:repository_push_email).and_raise(Net::SMTPFatalError.new(nil))
         allow(subject).to receive_message_chain(:logger, :info)
         perform
       end
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index c0d46a206ce..34567c6211d 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -272,6 +272,7 @@ RSpec.describe 'Every Sidekiq worker' do
         'Gitlab::GithubImport::ImportLfsObjectWorker' => 5,
         'Gitlab::GithubImport::ImportNoteWorker' => 5,
         'Gitlab::GithubImport::ImportProtectedBranchWorker' => 5,
+        'Gitlab::GithubImport::ImportCollaboratorWorker' => 5,
         'Gitlab::GithubImport::ImportPullRequestMergedByWorker' => 5,
         'Gitlab::GithubImport::ImportPullRequestReviewWorker' => 5,
         'Gitlab::GithubImport::PullRequests::ImportReviewRequestWorker' => 5,
@@ -285,6 +286,7 @@ RSpec.describe 'Every Sidekiq worker' do
         'Gitlab::GithubImport::Stage::ImportAttachmentsWorker' => 5,
         'Gitlab::GithubImport::Stage::ImportProtectedBranchesWorker' => 5,
         'Gitlab::GithubImport::Stage::ImportNotesWorker' => 5,
+        'Gitlab::GithubImport::Stage::ImportCollaboratorsWorker' => 5,
         'Gitlab::GithubImport::Stage::ImportPullRequestsMergedByWorker' => 5,
         'Gitlab::GithubImport::Stage::ImportPullRequestsReviewRequestsWorker' => 5,
         'Gitlab::GithubImport::Stage::ImportPullRequestsReviewsWorker' => 5,
diff --git a/spec/workers/gitlab/github_import/import_collaborator_worker_spec.rb b/spec/workers/gitlab/github_import/import_collaborator_worker_spec.rb
new file mode 100644
index 00000000000..b9463fb9a2d
--- /dev/null
+++ b/spec/workers/gitlab/github_import/import_collaborator_worker_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::GithubImport::ImportCollaboratorWorker, feature_category: :importers do
+  let(:worker) { described_class.new }
+
+  describe '#import' do
+    let(:project) do
+      instance_double('Project', full_path: 'foo/bar', id: 1, import_state: import_state)
+    end
+
+    let(:import_state) { build_stubbed(:import_state, :started) }
+    let(:client) { instance_double('Gitlab::GithubImport::Client') }
+    let(:importer) { instance_double('Gitlab::GithubImport::Importer::NoteAttachmentsImporter') }
+
+    it 'imports a collaborator' do
+      expect(Gitlab::GithubImport::Importer::CollaboratorImporter)
+        .to receive(:new)
+        .with(
+          an_instance_of(Gitlab::GithubImport::Representation::Collaborator),
+          project,
+          client
+        )
+        .and_return(importer)
+
+      expect(importer).to receive(:execute)
+
+      expect(Gitlab::GithubImport::ObjectCounter)
+        .to receive(:increment)
+        .and_call_original
+
+      worker.import(
+        project, client, { 'id' => 100500, 'login' => 'alice', 'role_name' => 'maintainer' }
+      )
+    end
+  end
+end
diff --git a/spec/workers/gitlab/github_import/stage/import_collaborators_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_collaborators_worker_spec.rb
new file mode 100644
index 00000000000..d71184d87d9
--- /dev/null
+++ b/spec/workers/gitlab/github_import/stage/import_collaborators_worker_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::GithubImport::Stage::ImportCollaboratorsWorker, feature_category: :importers 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::CollaboratorsImporter) }
+  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::CollaboratorsImporter)
+        .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 }, :pull_requests_merged_by)
+
+      worker.import(client, project)
+    end
+  end
+
+  it 'raises an error' do
+    exception = StandardError.new('_some_error_')
+
+    expect_next_instance_of(Gitlab::GithubImport::Importer::CollaboratorsImporter) do |importer|
+      expect(importer).to receive(:execute).and_raise(exception)
+    end
+    expect(Gitlab::Import::ImportFailureService).to receive(:track)
+      .with(
+        project_id: project.id,
+        exception: exception,
+        error_source: described_class.name,
+        fail_import: true,
+        metrics: true
+      ).and_call_original
+
+    expect { worker.import(client, project) }.to raise_error(StandardError)
+  end
+end
diff --git a/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb
index b18b5ce64d1..6ebf93730eb 100644
--- a/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb
+++ b/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::GithubImport::Stage::ImportPullRequestsWorker do
+RSpec.describe Gitlab::GithubImport::Stage::ImportPullRequestsWorker, feature_category: :importers do
   let_it_be(:project) { create(:project) }
   let_it_be(:import_state) { create(:import_state, project: project) }
 
@@ -28,7 +28,7 @@ RSpec.describe Gitlab::GithubImport::Stage::ImportPullRequestsWorker do
 
       expect(Gitlab::GithubImport::AdvanceStageWorker)
         .to receive(:perform_async)
-        .with(project.id, { '123' => 2 }, :pull_requests_merged_by)
+        .with(project.id, { '123' => 2 }, :collaborators)
 
       worker.import(client, project)
     end