1 files changed, 53 insertions, 42 deletions

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 68e001c7364..bf19147d4c8 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
@@ -9,9 +9,8 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
   let_it_be(:user) { create(:user) }
 
   let(:client) { instance_double('Gitlab::GithubImport::Client') }
-
   let(:issue_iid) { 999 }
-  let(:issue) { create(:issue, project: project, iid: issue_iid) }
+  let(:issuable) { create(:issue, project: project, iid: issue_iid) }
   let(:referenced_in) { build_stubbed(:issue, project: project, iid: issue_iid + 1) }
   let(:commit_id) { nil }
 
@@ -30,7 +29,7 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
         }
       },
       'created_at' => '2022-04-26 18:30:53 UTC',
-      'issue' => { 'number' => issue.iid }
+      'issue' => { 'number' => issuable.iid, pull_request: issuable.is_a?(MergeRequest) }
     )
   end
 
@@ -38,8 +37,8 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
   let(:expected_note_attrs) do
     {
       system: true,
-      noteable_type: Issue.name,
-      noteable_id: issue.id,
+      noteable_type: issuable.class.name,
+      noteable_id: issuable.id,
       project_id: project.id,
       author_id: user.id,
       note: expected_note_body,
@@ -47,58 +46,70 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::CrossReferenced, :clean_g
     }.stringify_keys
   end
 
-  context 'when referenced in other issue' do
-    let(:expected_note_body) { "mentioned in issue ##{referenced_in.iid}" }
-
-    before do
-      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)
+  shared_examples 'import cross-referenced event' do
+    context 'when referenced in other issue' do
+      let(:expected_note_body) { "mentioned in issue ##{referenced_in.iid}" }
+
+      before do
+        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(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
-    end
 
-    it 'creates expected note' do
-      importer.execute(issue_event)
+      it 'creates expected note' do
+        importer.execute(issue_event)
 
-      expect(issue.notes.count).to eq 1
-      expect(issue.notes[0]).to have_attributes expected_note_attrs
-      expect(issue.notes[0].system_note_metadata.action).to eq 'cross_reference'
+        expect(issuable.notes.count).to eq 1
+        expect(issuable.notes[0]).to have_attributes expected_note_attrs
+        expect(issuable.notes[0].system_note_metadata.action).to eq 'cross_reference'
+      end
     end
-  end
 
-  context 'when referenced in pull request' do
-    let(:referenced_in) { build_stubbed(:merge_request, project: project) }
-    let(:pull_request_resource) { { 'id' => referenced_in.iid } }
+    context 'when referenced in pull request' do
+      let(:referenced_in) { build_stubbed(:merge_request, project: project) }
+      let(:pull_request_resource) { { 'id' => referenced_in.iid } }
 
-    let(:expected_note_body) { "mentioned in merge request !#{referenced_in.iid}" }
+      let(:expected_note_body) { "mentioned in merge request !#{referenced_in.iid}" }
 
-    before do
-      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)
+      before do
+        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(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
-      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
-        allow(finder).to receive(:find).with(user.id, user.username).and_return(user.id)
+
+      it 'creates expected note' do
+        importer.execute(issue_event)
+
+        expect(issuable.notes.count).to eq 1
+        expect(issuable.notes[0]).to have_attributes expected_note_attrs
+        expect(issuable.notes[0].system_note_metadata.action).to eq 'cross_reference'
       end
     end
 
-    it 'creates expected note' do
-      importer.execute(issue_event)
+    context 'when referenced in out of project issue/pull_request' do
+      it 'does not create expected note' do
+        importer.execute(issue_event)
 
-      expect(issue.notes.count).to eq 1
-      expect(issue.notes[0]).to have_attributes expected_note_attrs
-      expect(issue.notes[0].system_note_metadata.action).to eq 'cross_reference'
+        expect(issuable.notes.count).to eq 0
+      end
     end
   end
 
-  context 'when referenced in out of project issue/pull_request' do
-    it 'does not create expected note' do
-      importer.execute(issue_event)
+  context 'with Issue' do
+    it_behaves_like 'import cross-referenced event'
+  end
 
-      expect(issue.notes.count).to eq 0
-    end
+  context 'with MergeRequest' do
+    let(:issuable) { create(:merge_request, source_project: project, target_project: project) }
+
+    it_behaves_like 'import cross-referenced event'
   end
 end