Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

14 files changed, 430 insertions, 42 deletions

diff --git a/spec/lib/gitlab/github_import/importer/events/base_importer_spec.rb b/spec/lib/gitlab/github_import/importer/events/base_importer_spec.rb
new file mode 100644
index 00000000000..41fe5fbdbbd
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/events/base_importer_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::GithubImport::Importer::Events::BaseImporter do
+  let(:project) { instance_double('Project') }
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
+  let(:issue_event) { instance_double('Gitlab::GithubImport::Representation::IssueEvent') }
+  let(:importer_class) { Class.new(described_class) }
+  let(:importer_instance) { importer_class.new(project, client) }
+
+  describe '#execute' do
+    it { expect { importer_instance.execute(issue_event) }.to raise_error(NotImplementedError) }
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/events/changed_assignee_spec.rb b/spec/lib/gitlab/github_import/importer/events/changed_assignee_spec.rb
new file mode 100644
index 00000000000..2f6f727dc38
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/events/changed_assignee_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::GithubImport::Importer::Events::ChangedAssignee do
+  subject(:importer) { described_class.new(project, client) }
+
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:assignee) { create(:user) }
+  let_it_be(:assigner) { create(:user) }
+
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
+  let(:issue) { create(:issue, project: project) }
+
+  let(:issue_event) do
+    Gitlab::GithubImport::Representation::IssueEvent.from_json_hash(
+      'id' => 6501124486,
+      'actor' => { 'id' => 4, 'login' => 'alice' },
+      'event' => event_type,
+      'commit_id' => nil,
+      'created_at' => '2022-04-26 18:30:53 UTC',
+      'assigner' => { 'id' => assigner.id, 'login' => assigner.username },
+      'assignee' => { 'id' => assignee.id, 'login' => assignee.username },
+      'issue' => { 'number' => issue.iid }
+    )
+  end
+
+  let(:note_attrs) do
+    {
+      noteable_id: issue.id,
+      noteable_type: Issue.name,
+      project_id: project.id,
+      author_id: assigner.id,
+      system: true,
+      created_at: issue_event.created_at,
+      updated_at: issue_event.created_at
+    }.stringify_keys
+  end
+
+  let(:expected_system_note_metadata_attrs) do
+    {
+      action: "assignee",
+      created_at: issue_event.created_at,
+      updated_at: issue_event.created_at
+    }.stringify_keys
+  end
+
+  shared_examples 'new note' do
+    it 'creates expected note' do
+      expect { importer.execute(issue_event) }.to change { issue.notes.count }
+        .from(0).to(1)
+
+      expect(issue.notes.last)
+        .to have_attributes(expected_note_attrs)
+    end
+
+    it 'creates expected system note metadata' do
+      expect { importer.execute(issue_event) }.to change { SystemNoteMetadata.count }
+        .from(0).to(1)
+
+      expect(SystemNoteMetadata.last)
+        .to have_attributes(
+          expected_system_note_metadata_attrs.merge(
+            note_id: Note.last.id
+          )
+        )
+    end
+  end
+
+  describe '#execute' do
+    before do
+      allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+        allow(finder).to receive(:database_id).and_return(issue.id)
+      end
+      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+        allow(finder).to receive(:find).with(assignee.id, assignee.username).and_return(assignee.id)
+        allow(finder).to receive(:find).with(assigner.id, assigner.username).and_return(assigner.id)
+      end
+    end
+
+    context 'when importing an assigned event' do
+      let(:event_type) { 'assigned' }
+      let(:expected_note_attrs) { note_attrs.merge(note: "assigned to @#{assignee.username}") }
+
+      it_behaves_like 'new note'
+    end
+
+    context 'when importing an unassigned event' do
+      let(:event_type) { 'unassigned' }
+      let(:expected_note_attrs) { note_attrs.merge(note: "unassigned @#{assigner.username}") }
+
+      it_behaves_like 'new note'
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/events/changed_label_spec.rb b/spec/lib/gitlab/github_import/importer/events/changed_label_spec.rb
index b773598853d..e21672aa430 100644
--- a/spec/lib/gitlab/github_import/importer/events/changed_label_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/events/changed_label_spec.rb
@@ -3,23 +3,25 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::Events::ChangedLabel do
-  subject(:importer) { described_class.new(project, user.id) }
+  subject(:importer) { described_class.new(project, client) }
 
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
   let(:issue) { create(:issue, project: project) }
   let!(:label) { create(:label, project: project) }
 
   let(:issue_event) do
     Gitlab::GithubImport::Representation::IssueEvent.from_json_hash(
       'id' => 6501124486,
-      'actor' => { 'id' => 4, 'login' => 'alice' },
+      'actor' => { 'id' => user.id, 'login' => user.username },
       'event' => event_type,
       'commit_id' => nil,
       'label_title' => label.title,
       'issue_db_id' => issue.id,
-      'created_at' => '2022-04-26 18:30:53 UTC'
+      'created_at' => '2022-04-26 18:30:53 UTC',
+      'issue' => { 'number' => issue.iid }
     )
   end
 
@@ -43,6 +45,12 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::ChangedLabel do
 
   before do
     allow(Gitlab::Cache::Import::Caching).to receive(:read_integer).and_return(label.id)
+    allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+      allow(finder).to receive(:database_id).and_return(issue.id)
+    end
+    allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+      allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+    end
   end
 
   context 'when importing a labeled event' do
diff --git a/spec/lib/gitlab/github_import/importer/events/changed_milestone_spec.rb b/spec/lib/gitlab/github_import/importer/events/changed_milestone_spec.rb
new file mode 100644
index 00000000000..2687627fc23
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/events/changed_milestone_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::GithubImport::Importer::Events::ChangedMilestone do
+  subject(:importer) { described_class.new(project, client) }
+
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
+  let(:issue) { create(:issue, project: project) }
+  let!(:milestone) { create(:milestone, project: project) }
+
+  let(:issue_event) do
+    Gitlab::GithubImport::Representation::IssueEvent.from_json_hash(
+      'id' => 6501124486,
+      'actor' => { 'id' => user.id, 'login' => user.username },
+      'event' => event_type,
+      'commit_id' => nil,
+      'milestone_title' => milestone.title,
+      'issue_db_id' => issue.id,
+      'created_at' => '2022-04-26 18:30:53 UTC',
+      'issue' => { 'number' => issue.iid }
+    )
+  end
+
+  let(:event_attrs) do
+    {
+      user_id: user.id,
+      issue_id: issue.id,
+      milestone_id: milestone.id,
+      state: 'opened',
+      created_at: issue_event.created_at
+    }.stringify_keys
+  end
+
+  shared_examples 'new event' do
+    it 'creates a new milestone event' do
+      expect { importer.execute(issue_event) }.to change { issue.resource_milestone_events.count }
+        .from(0).to(1)
+      expect(issue.resource_milestone_events.last)
+        .to have_attributes(expected_event_attrs)
+    end
+  end
+
+  describe '#execute' do
+    before do
+      allow(Gitlab::Cache::Import::Caching).to receive(:read_integer).and_return(milestone.id)
+      allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+        allow(finder).to receive(:database_id).and_return(issue.id)
+      end
+      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+        allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+      end
+    end
+
+    context 'when importing a milestoned event' do
+      let(:event_type) { 'milestoned' }
+      let(:expected_event_attrs) { event_attrs.merge(action: 'add') }
+
+      it_behaves_like 'new event'
+    end
+
+    context 'when importing demilestoned event' do
+      let(:event_type) { 'demilestoned' }
+      let(:expected_event_attrs) { event_attrs.merge(action: 'remove') }
+
+      it_behaves_like 'new event'
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/events/closed_spec.rb b/spec/lib/gitlab/github_import/importer/events/closed_spec.rb
index 116917d3e06..9a49d80a8bb 100644
--- a/spec/lib/gitlab/github_import/importer/events/closed_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/events/closed_spec.rb
@@ -3,11 +3,12 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::Events::Closed do
-  subject(:importer) { described_class.new(project, user.id) }
+  subject(:importer) { described_class.new(project, client) }
 
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
   let(:issue) { create(:issue, project: project) }
   let(:commit_id) { nil }
 
@@ -16,11 +17,11 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Closed do
       'id' => 6501124486,
       'node_id' => 'CE_lADOHK9fA85If7x0zwAAAAGDf0mG',
       'url' => 'https://api.github.com/repos/elhowm/test-import/issues/events/6501124486',
-      'actor' => { 'id' => 4, 'login' => 'alice' },
+      'actor' => { 'id' => user.id, 'login' => user.username },
       'event' => 'closed',
       'created_at' => '2022-04-26 18:30:53 UTC',
       'commit_id' => commit_id,
-      'issue_db_id' => issue.id
+      'issue' => { 'number' => issue.iid }
     )
   end
 
@@ -45,6 +46,15 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Closed do
     }.stringify_keys
   end
 
+  before do
+    allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+      allow(finder).to receive(:database_id).and_return(issue.id)
+    end
+    allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+      allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+    end
+  end
+
   it 'creates expected event and state event' do
     importer.execute(issue_event)
 
diff --git a/spec/lib/gitlab/github_import/importer/events/cross_referenced_spec.rb b/spec/lib/gitlab/github_import/importer/events/cross_referenced_spec.rb
index 118c482a7d9..68e001c7364 100644
--- a/spec/lib/gitlab/github_import/importer/events/cross_referenced_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/events/cross_referenced_spec.rb
@@ -3,15 +3,16 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_gitlab_redis_cache do
-  subject(:importer) { described_class.new(project, user.id) }
+  subject(:importer) { described_class.new(project, client) }
 
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
-  let(:sawyer_stub) { Struct.new(:iid, :issuable_type, keyword_init: true) }
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
 
-  let(:issue) { create(:issue, project: project) }
-  let(:referenced_in) { build_stubbed(:issue, project: project) }
+  let(:issue_iid) { 999 }
+  let(:issue) { create(:issue, project: project, iid: issue_iid) }
+  let(:referenced_in) { build_stubbed(:issue, project: project, iid: issue_iid + 1) }
   let(:commit_id) { nil }
 
   let(:issue_event) do
@@ -19,7 +20,7 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
       'id' => 6501124486,
       'node_id' => 'CE_lADOHK9fA85If7x0zwAAAAGDf0mG',
       'url' => 'https://api.github.com/repos/elhowm/test-import/issues/events/6501124486',
-      'actor' => { 'id' => 4, 'login' => 'alice' },
+      'actor' => { 'id' => user.id, 'login' => user.username },
       'event' => 'cross-referenced',
       'source' => {
         'type' => 'issue',
@@ -29,7 +30,7 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
         }
       },
       'created_at' => '2022-04-26 18:30:53 UTC',
-      'issue_db_id' => issue.id
+      'issue' => { 'number' => issue.iid }
     )
   end
 
@@ -38,7 +39,7 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
     {
       system: true,
       noteable_type: Issue.name,
-      noteable_id: issue_event.issue_db_id,
+      noteable_id: issue.id,
       project_id: project.id,
       author_id: user.id,
       note: expected_note_body,
@@ -47,12 +48,16 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
   end
 
   context 'when referenced in other issue' do
-    let(:expected_note_body) { "mentioned in issue ##{issue.iid}" }
+    let(:expected_note_body) { "mentioned in issue ##{referenced_in.iid}" }
 
     before do
-      other_issue_resource = sawyer_stub.new(iid: referenced_in.iid, issuable_type: 'Issue')
-      Gitlab::GithubImport::IssuableFinder.new(project, other_issue_resource)
-        .cache_database_id(referenced_in.iid)
+      allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+        allow(finder).to receive(:database_id).and_return(referenced_in.iid)
+        allow(finder).to receive(:database_id).and_return(issue.id)
+      end
+      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+        allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+      end
     end
 
     it 'creates expected note' do
@@ -71,10 +76,13 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
     let(:expected_note_body) { "mentioned in merge request !#{referenced_in.iid}" }
 
     before do
-      other_issue_resource =
-        sawyer_stub.new(iid: referenced_in.iid, issuable_type: 'MergeRequest')
-      Gitlab::GithubImport::IssuableFinder.new(project, other_issue_resource)
-        .cache_database_id(referenced_in.iid)
+      allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+        allow(finder).to receive(:database_id).and_return(referenced_in.iid)
+        allow(finder).to receive(:database_id).and_return(issue.id)
+      end
+      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+        allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+      end
     end
 
     it 'creates expected note' do
@@ -87,7 +95,7 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
   end
 
   context 'when referenced in out of project issue/pull_request' do
-    it 'creates expected note' do
+    it 'does not create expected note' do
       importer.execute(issue_event)
 
       expect(issue.notes.count).to eq 0
diff --git a/spec/lib/gitlab/github_import/importer/events/renamed_spec.rb b/spec/lib/gitlab/github_import/importer/events/renamed_spec.rb
index a8c3fbcb05d..316ea798965 100644
--- a/spec/lib/gitlab/github_import/importer/events/renamed_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/events/renamed_spec.rb
@@ -3,23 +3,24 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::Events::Renamed do
-  subject(:importer) { described_class.new(project, user.id) }
+  subject(:importer) { described_class.new(project, client) }
 
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
   let(:issue) { create(:issue, project: project) }
 
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
   let(:issue_event) do
     Gitlab::GithubImport::Representation::IssueEvent.from_json_hash(
       'id' => 6501124486,
-      'actor' => { 'id' => 4, 'login' => 'alice' },
+      'actor' => { 'id' => user.id, 'login' => user.username },
       'event' => 'renamed',
       'commit_id' => nil,
       'created_at' => '2022-04-26 18:30:53 UTC',
       'old_title' => 'old title',
       'new_title' => 'new title',
-      'issue_db_id' => issue.id
+      'issue' => { 'number' => issue.iid }
     )
   end
 
@@ -45,6 +46,15 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Renamed do
   end
 
   describe '#execute' do
+    before do
+      allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+        allow(finder).to receive(:database_id).and_return(issue.id)
+      end
+      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+        allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+      end
+    end
+
     it 'creates expected note' do
       expect { importer.execute(issue_event) }.to change { issue.notes.count }
         .from(0).to(1)
diff --git a/spec/lib/gitlab/github_import/importer/events/reopened_spec.rb b/spec/lib/gitlab/github_import/importer/events/reopened_spec.rb
index 81653b0ecdc..2461dbb9701 100644
--- a/spec/lib/gitlab/github_import/importer/events/reopened_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/events/reopened_spec.rb
@@ -3,11 +3,12 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::Events::Reopened, :aggregate_failures do
-  subject(:importer) { described_class.new(project, user.id) }
+  subject(:importer) { described_class.new(project, client) }
 
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
+  let(:client) { instance_double('Gitlab::GithubImport::Client') }
   let(:issue) { create(:issue, project: project) }
 
   let(:issue_event) do
@@ -15,10 +16,10 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Reopened, :aggregate_fail
       'id' => 6501124486,
       'node_id' => 'CE_lADOHK9fA85If7x0zwAAAAGDf0mG',
       'url' => 'https://api.github.com/repos/elhowm/test-import/issues/events/6501124486',
-      'actor' => { 'id' => 4, 'login' => 'alice' },
+      'actor' => { 'id' => user.id, 'login' => user.username },
       'event' => 'reopened',
       'created_at' => '2022-04-26 18:30:53 UTC',
-      'issue_db_id' => issue.id
+      'issue' => { 'number' => issue.iid }
     )
   end
 
@@ -42,6 +43,15 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Reopened, :aggregate_fail
     }.stringify_keys
   end
 
+  before do
+    allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
+      allow(finder).to receive(:database_id).and_return(issue.id)
+    end
+    allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+      allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+    end
+  end
+
   it 'creates expected event and state event' do
     importer.execute(issue_event)
 
diff --git a/spec/lib/gitlab/github_import/importer/issue_event_importer_spec.rb b/spec/lib/gitlab/github_import/importer/issue_event_importer_spec.rb
index da32a3b3766..33d5fbf13a0 100644
--- a/spec/lib/gitlab/github_import/importer/issue_event_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/issue_event_importer_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueEventImporter, :clean_gitlab
       specific_importer = double(importer_class.name) # rubocop:disable RSpec/VerifiedDoubles
 
       expect(importer_class)
-        .to receive(:new).with(project, user.id)
+        .to receive(:new).with(project, client)
         .and_return(specific_importer)
       expect(specific_importer).to receive(:execute).with(issue_event)
 
@@ -43,12 +43,6 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueEventImporter, :clean_gitlab
 
   describe '#execute' do
     before do
-      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
-        allow(finder).to receive(:author_id_for)
-          .with(issue_event, author_key: :actor)
-          .and_return(user.id, true)
-      end
-
       issue_event.attributes[:issue_db_id] = issue.id
     end
 
@@ -87,6 +81,20 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueEventImporter, :clean_gitlab
                       Gitlab::GithubImport::Importer::Events::Renamed
     end
 
+    context "when it's milestoned issue event" do
+      let(:event_name) { 'milestoned' }
+
+      it_behaves_like 'triggers specific event importer',
+                      Gitlab::GithubImport::Importer::Events::ChangedMilestone
+    end
+
+    context "when it's demilestoned issue event" do
+      let(:event_name) { 'demilestoned' }
+
+      it_behaves_like 'triggers specific event importer',
+                      Gitlab::GithubImport::Importer::Events::ChangedMilestone
+    end
+
     context "when it's cross-referenced issue event" do
       let(:event_name) { 'cross-referenced' }
 
@@ -94,6 +102,20 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueEventImporter, :clean_gitlab
                       Gitlab::GithubImport::Importer::Events::CrossReferenced
     end
 
+    context "when it's assigned issue event" do
+      let(:event_name) { 'assigned' }
+
+      it_behaves_like 'triggers specific event importer',
+                      Gitlab::GithubImport::Importer::Events::ChangedAssignee
+    end
+
+    context "when it's unassigned issue event" do
+      let(:event_name) { 'unassigned' }
+
+      it_behaves_like 'triggers specific event importer',
+                      Gitlab::GithubImport::Importer::Events::ChangedAssignee
+    end
+
     context "when it's unknown issue event" do
       let(:event_name) { 'fake' }
 
diff --git a/spec/lib/gitlab/github_import/importer/issue_events_importer_spec.rb b/spec/lib/gitlab/github_import/importer/issue_events_importer_spec.rb
new file mode 100644
index 00000000000..8d4c1b01e50
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/issue_events_importer_spec.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::GithubImport::Importer::IssueEventsImporter do
+  subject(:importer) { described_class.new(project, client, parallel: parallel) }
+
+  let(:project) { instance_double(Project, id: 4, import_source: 'foo/bar') }
+  let(:client) { instance_double(Gitlab::GithubImport::Client) }
+
+  let(:parallel) { true }
+  let(:issue_event) do
+    struct = Struct.new(
+      :id, :node_id, :url, :actor, :event, :commit_id, :commit_url, :label, :rename, :milestone,
+      :source, :assignee, :assigner, :issue, :created_at, :performed_via_github_app,
+      keyword_init: true
+    )
+    struct.new(id: rand(10), event: 'closed', created_at: '2022-04-26 18:30:53 UTC')
+  end
+
+  describe '#parallel?' do
+    context 'when running in parallel mode' do
+      it { expect(importer).to be_parallel }
+    end
+
+    context 'when running in sequential mode' do
+      let(:parallel) { false }
+
+      it { expect(importer).not_to be_parallel }
+    end
+  end
+
+  describe '#execute' do
+    context 'when running in parallel mode' do
+      it 'imports events in parallel' do
+        expect(importer).to receive(:parallel_import)
+
+        importer.execute
+      end
+    end
+
+    context 'when running in sequential mode' do
+      let(:parallel) { false }
+
+      it 'imports notes in sequence' do
+        expect(importer).to receive(:sequential_import)
+
+        importer.execute
+      end
+    end
+  end
+
+  describe '#sequential_import' do
+    let(:parallel) { false }
+
+    it 'imports each event in sequence' do
+      event_importer = instance_double(Gitlab::GithubImport::Importer::IssueEventImporter)
+
+      allow(importer).to receive(:each_object_to_import).and_yield(issue_event)
+
+      expect(Gitlab::GithubImport::Importer::IssueEventImporter)
+        .to receive(:new)
+        .with(
+          an_instance_of(Gitlab::GithubImport::Representation::IssueEvent),
+          project,
+          client
+        )
+        .and_return(event_importer)
+
+      expect(event_importer).to receive(:execute)
+
+      importer.sequential_import
+    end
+  end
+
+  describe '#parallel_import' do
+    it 'imports each note in parallel' do
+      allow(importer).to receive(:each_object_to_import).and_yield(issue_event)
+
+      expect(Gitlab::GithubImport::ImportIssueEventWorker).to receive(:bulk_perform_in).with(
+        1.second, [
+          [project.id, an_instance_of(Hash), an_instance_of(String)]
+        ], batch_size: 1000, batch_delay: 1.minute
+      )
+
+      waiter = importer.parallel_import
+
+      expect(waiter).to be_an_instance_of(Gitlab::JobWaiter)
+      expect(waiter.jobs_remaining).to eq(1)
+    end
+  end
+
+  describe '#importer_class' do
+    it { expect(importer.importer_class).to eq Gitlab::GithubImport::Importer::IssueEventImporter }
+  end
+
+  describe '#representation_class' do
+    it { expect(importer.representation_class).to eq Gitlab::GithubImport::Representation::IssueEvent }
+  end
+
+  describe '#sidekiq_worker_class' do
+    it { expect(importer.sidekiq_worker_class).to eq Gitlab::GithubImport::ImportIssueEventWorker }
+  end
+
+  describe '#object_type' do
+    it { expect(importer.object_type).to eq :issue_event }
+  end
+
+  describe '#collection_method' do
+    it { expect(importer.collection_method).to eq :repository_issue_events }
+  end
+
+  describe '#id_for_already_imported_cache' do
+    it 'returns the ID of the given note' do
+      expect(importer.id_for_already_imported_cache(issue_event)).to eq(issue_event.id)
+    end
+  end
+
+  describe '#collection_options' do
+    it { expect(importer.collection_options).to eq({}) }
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb b/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb
index 570d26cdf2d..1692aac49f2 100644
--- a/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cache do
+  let_it_be(:work_item_type_id) { ::WorkItems::Type.default_issue_type.id }
+
   let(:project) { create(:project) }
   let(:client) { double(:client) }
   let(:user) { create(:user) }
@@ -25,7 +27,8 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redi
       author: Gitlab::GithubImport::Representation::User.new(id: 4, login: 'alice'),
       created_at: created_at,
       updated_at: updated_at,
-      pull_request: false
+      pull_request: false,
+      work_item_type_id: work_item_type_id
     )
   end
 
@@ -116,6 +119,17 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redi
         .and_return(milestone.id)
     end
 
+    it 'creates issues with a work item type id' do
+      allow(importer.user_finder)
+        .to receive(:author_id_for)
+        .with(issue)
+        .and_return([user.id, true])
+
+      issue_id = importer.create_issue
+
+      expect(Issue.find(issue_id).work_item_type_id).to eq(work_item_type_id)
+    end
+
     context 'when the issue author could be found' do
       it 'creates the issue with the found author as the issue author' do
         allow(importer.user_finder)
@@ -136,7 +150,8 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redi
               milestone_id: milestone.id,
               state_id: 1,
               created_at: created_at,
-              updated_at: updated_at
+              updated_at: updated_at,
+              work_item_type_id: work_item_type_id
             },
             project.issues
           )
@@ -166,7 +181,8 @@ RSpec.describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redi
               milestone_id: milestone.id,
               state_id: 1,
               created_at: created_at,
-              updated_at: updated_at
+              updated_at: updated_at,
+              work_item_type_id: work_item_type_id
             },
             project.issues
           )
diff --git a/spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb b/spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb
index 6dfd4424342..251829b83a0 100644
--- a/spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Gitlab::GithubImport::Importer::LfsObjectsImporter do
 
   let(:lfs_attributes) do
     {
-      oid: 'oid',
+      oid: 'a' * 64,
       size: 1,
       link: 'http://www.gitlab.com/lfs_objects/oid'
     }
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
index c1b0f4df29a..c5846fa7a87 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
@@ -149,7 +149,7 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestsImporter do
       expect(importer)
         .to receive(:update_repository)
 
-      importer.each_object_to_import { }
+      importer.each_object_to_import {}
     end
   end
 
diff --git a/spec/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer_spec.rb b/spec/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer_spec.rb
index 087faeffe02..bb1ee79ad93 100644
--- a/spec/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter
 
   describe '#each_object_to_import', :clean_gitlab_redis_cache do
     let(:issue_event) do
-      struct = Struct.new(:id, :event, :created_at, :issue_db_id, keyword_init: true)
+      struct = Struct.new(:id, :event, :created_at, :issue, keyword_init: true)
       struct.new(id: rand(10), event: 'closed', created_at: '2022-04-26 18:30:53 UTC')
     end
 
@@ -81,7 +81,7 @@ RSpec.describe Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter
       counter = 0
       subject.each_object_to_import do |object|
         expect(object).to eq issue_event
-        expect(issue_event.issue_db_id).to eq issue.id
+        expect(issue_event.issue['number']).to eq issue.iid
         counter += 1
       end
       expect(counter).to eq 1