1 files changed, 88 insertions, 0 deletions
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests/merged_by_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests/merged_by_importer_spec.rb
new file mode 100644
index 00000000000..25381594632
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/pull_requests/merged_by_importer_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::GithubImport::Importer::PullRequests::MergedByImporter,
+  :clean_gitlab_redis_cache, feature_category: :importers do
+  let_it_be(:merge_request) { create(:merged_merge_request) }
+
+  let(:project) { merge_request.project }
+  let(:merged_at) { Time.utc(2017, 1, 1, 12) }
+  let(:client_double) do
+    instance_double(Gitlab::GithubImport::Client, user: { id: 999, login: 'merger', email: 'merger@email.com' })
+  end
+
+  let(:merger_user) { { id: 999, login: 'merger' } }
+
+  let(:pull_request) do
+    Gitlab::GithubImport::Representation::PullRequest.from_api_response(
+      {
+        number: merge_request.iid,
+        merged_at: merged_at,
+        merged_by: merger_user
+      }
+    )
+  end
+
+  subject { described_class.new(pull_request, project, client_double) }
+
+  shared_examples 'adds a note referencing the merger user' do
+    it 'adds a note referencing the merger user' do
+      expect { subject.execute }
+        .to change { Note.count }.by(1)
+        .and not_change(merge_request, :updated_at)
+
+      metrics = merge_request.metrics.reload
+      expect(metrics.merged_by).to be_nil
+      expect(metrics.merged_at).to eq(merged_at)
+
+      last_note = merge_request.notes.last
+      expect(last_note.created_at).to eq(merged_at)
+      expect(last_note.author).to eq(project.creator)
+      expect(last_note.note).to eq("*Merged by: merger at #{merged_at}*")
+    end
+  end
+
+  context 'when the merger user can be mapped' do
+    it 'assigns the merged by user when mapped' do
+      merge_user = create(:user, email: 'merger@email.com')
+
+      subject.execute
+
+      metrics = merge_request.metrics.reload
+      expect(metrics.merged_by).to eq(merge_user)
+      expect(metrics.merged_at).to eq(merged_at)
+    end
+  end
+
+  context 'when the merger user cannot be mapped to a gitlab user' do
+    it_behaves_like 'adds a note referencing the merger user'
+
+    context 'when original user cannot be found on github' do
+      before do
+        allow(client_double).to receive(:user).and_raise(Octokit::NotFound)
+      end
+
+      it_behaves_like 'adds a note referencing the merger user'
+    end
+  end
+
+  context 'when the merger user is not provided' do
+    let(:merger_user) { nil }
+
+    it 'adds a note referencing the merger user' do
+      expect { subject.execute }
+        .to change { Note.count }.by(1)
+        .and not_change(merge_request, :updated_at)
+
+      metrics = merge_request.metrics.reload
+      expect(metrics.merged_by).to be_nil
+      expect(metrics.merged_at).to eq(merged_at)
+
+      last_note = merge_request.notes.last
+      expect(last_note.created_at).to eq(merged_at)
+      expect(last_note.author).to eq(project.creator)
+      expect(last_note.note).to eq("*Merged by: ghost at #{merged_at}*")
+    end
+  end
+end