Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-10 18:09:14 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-10 18:09:14 +0300
commitff06f859cdabec3c874c004f93fe5082aeacf917 (patch)
tree5269b37a4cd5181869267e3ce9ece4d11518752b /spec/serializers/discussion_entity_spec.rb
parenta08f8baa63c0aea7fcf969da40d30e6cf56365cc (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers/discussion_entity_spec.rb')
-rw-r--r--spec/serializers/discussion_entity_spec.rb4
1 files changed, 4 insertions, 0 deletions
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)