2 files changed, 58 insertions, 0 deletions
diff --git a/spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb b/spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb
index 5ebb5ffed3b..0ed320e863c 100644
--- a/spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb
+++ b/spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::PullRequestEntity, feature_c
   let_it_be(:project) { create_default(:project, :repository) }
   let_it_be(:merge_requests) { create_list(:merge_request, 2, :unique_branches) }
   let_it_be(:notes) { create_list(:note, 2, system: false, noteable: merge_requests.first) }
+  let_it_be(:merge_request_reviewers) { create_pair(:merge_request_reviewer, merge_request: merge_requests[0]) }
 
   subject { described_class.represent(merge_requests).as_json }
 
@@ -13,6 +14,10 @@ RSpec.describe Atlassian::JiraConnect::Serializers::PullRequestEntity, feature_c
     expect(subject.first[:commentCount]).to eq(2)
   end
 
+  it 'exposes reviewers' do
+    expect(subject.first[:reviewers].count).to eq(2)
+  end
+
   context 'with user_notes_count option' do
     let(:user_notes_count) { merge_requests.to_h { |merge_request| [merge_request.id, 1] } }
 
@@ -25,6 +30,11 @@ RSpec.describe Atlassian::JiraConnect::Serializers::PullRequestEntity, feature_c
 
       merge_requests << create(:merge_request, :unique_branches)
 
+      # In normal use of this entity, reviewer data is preloaded in JiraConnect::SyncService
+      ActiveRecord::Associations::Preloader.new(
+        records: merge_requests, associations: { merge_request_reviewers: :reviewer }
+      ).call
+
       expect { subject }.not_to exceed_query_limit(control_count)
     end
 
diff --git a/spec/lib/atlassian/jira_connect/serializers/reviewer_entity_spec.rb b/spec/lib/atlassian/jira_connect/serializers/reviewer_entity_spec.rb
new file mode 100644
index 00000000000..5a8667ec830
--- /dev/null
+++ b/spec/lib/atlassian/jira_connect/serializers/reviewer_entity_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Atlassian::JiraConnect::Serializers::ReviewerEntity, feature_category: :integrations do
+  subject { described_class.represent(merge_request_reviewer, merge_request: merge_request) }
+
+  let_it_be_with_reload(:merge_request) { create(:merge_request) }
+  let_it_be(:reviewer) { create(:user) }
+  let(:merge_request_reviewer) { build(:merge_request_reviewer, merge_request: merge_request, reviewer: reviewer) }
+
+  describe '#to_json' do
+    it { expect(subject.to_json).to be_valid_json.and match_schema('jira_connect/reviewer') }
+  end
+
+  it 'exposes all fields' do
+    expect(subject.as_json.keys).to contain_exactly(:name, :email, :approvalStatus)
+  end
+
+  it 'exposes correct user\'s data' do
+    expect(subject.as_json[:name]).to eq(reviewer.name)
+    expect(subject.as_json[:email]).to eq(reviewer.email)
+  end
+
+  it 'exposes correct approval status' do
+    expect(subject.as_json[:approvalStatus]).to eq('UNAPPROVED')
+  end
+
+  context 'with MR is reviewer, but not approved' do
+    before do
+      merge_request_reviewer.reviewed!
+    end
+
+    it 'exposes correct approval status' do
+      expect(subject.as_json[:approvalStatus]).to eq('NEEDSWORK')
+    end
+  end
+
+  context 'when MR is approved' do
+    before do
+      create(:approval, user: reviewer, merge_request: merge_request)
+    end
+
+    it 'exposes correct approval status' do
+      expect(subject.as_json[:approvalStatus]).to eq('APPROVED')
+    end
+  end
+end