1 files changed, 50 insertions, 30 deletions

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 9a49d80a8bb..f7e38f373c0 100644
--- a/spec/lib/gitlab/github_import/importer/events/closed_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/events/closed_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Closed do
   let_it_be(:user) { create(:user) }
 
   let(:client) { instance_double('Gitlab::GithubImport::Client') }
-  let(:issue) { create(:issue, project: project) }
+  let(:issuable) { create(:issue, project: project) }
   let(:commit_id) { nil }
 
   let(:issue_event) do
@@ -21,7 +21,7 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Closed do
       'event' => 'closed',
       'created_at' => '2022-04-26 18:30:53 UTC',
       'commit_id' => commit_id,
-      'issue' => { 'number' => issue.iid }
+      'issue' => { 'number' => issuable.iid, pull_request: issuable.is_a?(MergeRequest) }
     )
   end
 
@@ -29,54 +29,74 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Closed do
     {
       project_id: project.id,
       author_id: user.id,
-      target_id: issue.id,
-      target_type: Issue.name,
+      target_id: issuable.id,
+      target_type: issuable.class.name,
       action: 'closed',
       created_at: issue_event.created_at,
       updated_at: issue_event.created_at
     }.stringify_keys
   end
 
-  let(:expected_state_event_attrs) do
-    {
-      user_id: user.id,
-      issue_id: issue.id,
-      state: 'closed',
-      created_at: issue_event.created_at
-    }.stringify_keys
-  end
-
   before do
     allow_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |finder|
-      allow(finder).to receive(:database_id).and_return(issue.id)
+      allow(finder).to receive(:database_id).and_return(issuable.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)
+  shared_examples 'new event' do
+    it 'creates expected event and state event' do
+      importer.execute(issue_event)
+
+      expect(issuable.events.count).to eq 1
+      expect(issuable.events[0].attributes)
+        .to include expected_event_attrs
+
+      expect(issuable.resource_state_events.count).to eq 1
+      expect(issuable.resource_state_events[0].attributes)
+        .to include expected_state_event_attrs
+    end
+
+    context 'when closed by commit' do
+      let!(:closing_commit) { create(:commit, project: project) }
+      let(:commit_id) { closing_commit.id }
 
-    expect(issue.events.count).to eq 1
-    expect(issue.events[0].attributes)
-      .to include expected_event_attrs
+      it 'creates expected event and state event' do
+        importer.execute(issue_event)
 
-    expect(issue.resource_state_events.count).to eq 1
-    expect(issue.resource_state_events[0].attributes)
-      .to include expected_state_event_attrs
+        expect(issuable.events.count).to eq 1
+        state_event = issuable.resource_state_events.last
+        expect(state_event.source_commit).to eq commit_id[0..40]
+      end
+    end
   end
 
-  context 'when closed by commit' do
-    let!(:closing_commit) { create(:commit, project: project) }
-    let(:commit_id) { closing_commit.id }
+  context 'with Issue' do
+    let(:expected_state_event_attrs) do
+      {
+        user_id: user.id,
+        issue_id: issuable.id,
+        state: 'closed',
+        created_at: issue_event.created_at
+      }.stringify_keys
+    end
 
-    it 'creates expected event and state event' do
-      importer.execute(issue_event)
+    it_behaves_like 'new event'
+  end
 
-      expect(issue.events.count).to eq 1
-      state_event = issue.resource_state_events.last
-      expect(state_event.source_commit).to eq commit_id[0..40]
+  context 'with MergeRequest' do
+    let(:issuable) { create(:merge_request, source_project: project, target_project: project) }
+    let(:expected_state_event_attrs) do
+      {
+        user_id: user.id,
+        merge_request_id: issuable.id,
+        state: 'closed',
+        created_at: issue_event.created_at
+      }.stringify_keys
     end
+
+    it_behaves_like 'new event'
   end
 end