diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 18:09:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 18:09:04 +0300 |
commit | 74dd67ddea70f70830f3fe1ca65b06b604ec229f (patch) | |
tree | 7347826741dfed35d59e53890907e9e17a7afa4f /spec/lib | |
parent | a662b146aca7227bc800eed4878000d2b7c9d757 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/atlassian/jira_connect/client_spec.rb | 21 | ||||
-rw-r--r-- | spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb | 43 |
2 files changed, 61 insertions, 3 deletions
diff --git a/spec/lib/atlassian/jira_connect/client_spec.rb b/spec/lib/atlassian/jira_connect/client_spec.rb index 2fd2fe66173..cefd1fa3274 100644 --- a/spec/lib/atlassian/jira_connect/client_spec.rb +++ b/spec/lib/atlassian/jira_connect/client_spec.rb @@ -20,8 +20,11 @@ RSpec.describe Atlassian::JiraConnect::Client do end describe '#store_dev_info' do - it "calls the API with auth headers" do - expected_jwt = Atlassian::Jwt.encode( + let_it_be(:project) { create_default(:project, :repository) } + let_it_be(:merge_requests) { create_list(:merge_request, 2, :unique_branches) } + + let(:expected_jwt) do + Atlassian::Jwt.encode( Atlassian::Jwt.build_claims( Atlassian::JiraConnect.app_key, '/rest/devinfo/0.10/bulk', @@ -29,7 +32,9 @@ RSpec.describe Atlassian::JiraConnect::Client do ), 'sample_secret' ) + end + before do stub_full_request('https://gitlab-test.atlassian.net/rest/devinfo/0.10/bulk', method: :post) .with( headers: { @@ -37,8 +42,18 @@ RSpec.describe Atlassian::JiraConnect::Client do 'Content-Type' => 'application/json' } ) + end + + it "calls the API with auth headers" do + subject.store_dev_info(project: project) + end + + it 'avoids N+1 database queries' do + control_count = ActiveRecord::QueryRecorder.new { subject.store_dev_info(project: project, merge_requests: merge_requests) }.count + + merge_requests << create(:merge_request, :unique_branches) - subject.store_dev_info(project: create(:project)) + expect { subject.store_dev_info(project: project, merge_requests: merge_requests) }.not_to exceed_query_limit(control_count) end end end 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 new file mode 100644 index 00000000000..872ba1ab43d --- /dev/null +++ b/spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb @@ -0,0 +1,43 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Atlassian::JiraConnect::Serializers::PullRequestEntity do + 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) } + + subject { described_class.represent(merge_requests).as_json } + + it 'exposes commentCount' do + expect(subject.first[:commentCount]).to eq(2) + end + + context 'with user_notes_count option' do + let(:user_notes_count) { merge_requests.map { |merge_request| [merge_request.id, 1] }.to_h } + + subject { described_class.represent(merge_requests, user_notes_count: user_notes_count).as_json } + + it 'avoids N+1 database queries' do + control_count = ActiveRecord::QueryRecorder.new do + described_class.represent(merge_requests, user_notes_count: user_notes_count) + end.count + + merge_requests << create(:merge_request, :unique_branches) + + expect { subject }.not_to exceed_query_limit(control_count) + end + + it 'uses counts from user_notes_count' do + expect(subject.map { |entity| entity[:commentCount] }).to match_array([1, 1, 1]) + end + + context 'when count is missing for some MRs' do + let(:user_notes_count) { [[merge_requests.last.id, 1]].to_h } + + it 'uses 0 as default when count for the MR is not available' do + expect(subject.map { |entity| entity[:commentCount] }).to match_array([0, 0, 1]) + end + end + end +end |