diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-10 18:09:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-10 18:09:14 +0300 |
commit | ff06f859cdabec3c874c004f93fe5082aeacf917 (patch) | |
tree | 5269b37a4cd5181869267e3ce9ece4d11518752b /spec/serializers | |
parent | a08f8baa63c0aea7fcf969da40d30e6cf56365cc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/base_discussion_entity_spec.rb | 69 | ||||
-rw-r--r-- | spec/serializers/discussion_entity_spec.rb | 4 |
2 files changed, 73 insertions, 0 deletions
diff --git a/spec/serializers/base_discussion_entity_spec.rb b/spec/serializers/base_discussion_entity_spec.rb new file mode 100644 index 00000000000..5f483da4113 --- /dev/null +++ b/spec/serializers/base_discussion_entity_spec.rb @@ -0,0 +1,69 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe BaseDiscussionEntity do + let_it_be(:user) { create(:user) } + let_it_be(:note) { create(:discussion_note_on_merge_request) } + + let(:request) { double('request', note_entity: ProjectNoteEntity) } + let(:controller) { double('controller') } + let(:entity) { described_class.new(discussion, request: request, context: controller) } + let(:discussion) { note.discussion } + + subject { entity.as_json } + + before do + allow(controller).to receive(:render_to_string) + allow(request).to receive(:current_user).and_return(user) + allow(request).to receive(:noteable).and_return(note.noteable) + end + + it 'exposes correct attributes' do + expect(subject.keys.sort).to include( + :commit_id, + :confidential, + :diff_discussion, + :discussion_path, + :expanded, + :for_commit, + :id, + :individual_note, + :resolvable, + :resolve_path, + :resolve_with_issue_path + ) + end + + context 'when is LegacyDiffDiscussion' do + let(:project) { create(:project) } + let(:merge_request) { create(:merge_request, source_project: project) } + let(:discussion) { create(:legacy_diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion } + + it 'exposes correct attributes' do + expect(subject.keys.sort).to include( + :commit_id, + :diff_discussion, + :discussion_path, + :expanded, + :for_commit, + :id, + :individual_note + ) + end + end + + context 'when diff file is present' do + let(:note) { create(:diff_note_on_merge_request) } + + it 'exposes diff file attributes' do + expect(subject.keys.sort).to include( + :active, + :diff_file, + :line_code, + :position, + :truncated_diff_lines + ) + end + end +end diff --git a/spec/serializers/discussion_entity_spec.rb b/spec/serializers/discussion_entity_spec.rb index e1734d5290f..0645d19da5b 100644 --- a/spec/serializers/discussion_entity_spec.rb +++ b/spec/serializers/discussion_entity_spec.rb @@ -39,6 +39,10 @@ RSpec.describe DiscussionEntity do ) end + it 'does not include base discussion in the notes' do + expect(subject[:notes].first.keys).not_to include(:base_discussion) + end + it 'resolved_by matches note_user_entity schema' do Notes::ResolveService.new(note.project, user).execute(note) |