diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-10-01 10:53:08 -0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-10-01 10:53:08 -0300 |
commit | b18345fac49e3b0ef35a22f3d784aef9f6bf9209 (patch) | |
tree | f74c10565f781c04bbe9a62efa0e8fcd1af13982 /spec | |
parent | e5d3a75aac4f0bb287699b21f3a56b8bfe499665 (diff) | |
download | gitlab-ce-b18345fac49e3b0ef35a22f3d784aef9f6bf9209.tar.gz |
Filter user sensitive data from discussions JSON
Diffstat (limited to 'spec')
-rw-r--r-- | spec/fixtures/api/schemas/entities/note_user_entity.json | 21 | ||||
-rw-r--r-- | spec/serializers/discussion_entity_spec.rb | 7 |
2 files changed, 28 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/note_user_entity.json b/spec/fixtures/api/schemas/entities/note_user_entity.json new file mode 100644 index 00000000000..9b838054563 --- /dev/null +++ b/spec/fixtures/api/schemas/entities/note_user_entity.json @@ -0,0 +1,21 @@ +{ + "type": "object", + "required": [ + "id", + "state", + "avatar_url", + "path", + "name", + "username" + ], + "properties": { + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "string" }, + "path": { "type": "string" }, + "name": { "type": "string" }, + "username": { "type": "string" }, + "status_tooltip_html": { "$ref": "../types/nullable_string.json" } + }, + "additionalProperties": false +} diff --git a/spec/serializers/discussion_entity_spec.rb b/spec/serializers/discussion_entity_spec.rb index 378540a35b6..0590304e832 100644 --- a/spec/serializers/discussion_entity_spec.rb +++ b/spec/serializers/discussion_entity_spec.rb @@ -36,6 +36,13 @@ describe DiscussionEntity do ) end + it 'resolved_by matches note_user_entity schema' do + Notes::ResolveService.new(note.project, user).execute(note) + + expect(subject[:resolved_by].with_indifferent_access) + .to match_schema('entities/note_user_entity') + end + context 'when is LegacyDiffDiscussion' do let(:project) { create(:project) } let(:merge_request) { create(:merge_request, source_project: project) } |