diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 14:34:22 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 14:34:22 +0300 |
commit | 33fb2f99e92acc96ab322f4594a13f11218db87e (patch) | |
tree | b0d34a33e47a634c78b03fa0c2aa4667c6f67067 /spec/serializers | |
parent | 3013951c7318d6b08d83c6ec96a4d68d031c3a62 (diff) | |
parent | 6185ce0c84b5674abf4f54576fec44fece571565 (diff) |
Merge branch '40549-render-emoj-in-groups-overview' into 'master'
Resolve "No Rendering of emoji's in Group-Overview after update"
Closes #40549
See merge request gitlab-org/gitlab-ce!16098
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/group_child_entity_spec.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/spec/serializers/group_child_entity_spec.rb b/spec/serializers/group_child_entity_spec.rb index 452754d7a79..505a9eaac5a 100644 --- a/spec/serializers/group_child_entity_spec.rb +++ b/spec/serializers/group_child_entity_spec.rb @@ -22,6 +22,7 @@ describe GroupChildEntity do avatar_url name description + markdown_description visibility type can_edit @@ -60,9 +61,10 @@ describe GroupChildEntity do end describe 'for a group', :nested_groups do + let(:description) { 'Awesomeness' } let(:object) do create(:group, :nested, :with_avatar, - description: 'Awesomeness') + description: description) end before do @@ -96,6 +98,14 @@ describe GroupChildEntity do expect(json[:edit_path]).to eq(edit_group_path(object)) end + context 'emoji in description' do + let(:description) { ':smile:' } + + it 'has the correct markdown_description' do + expect(json[:markdown_description]).to eq('<p dir="auto"><gl-emoji title="smiling face with open mouth and smiling eyes" data-name="smile" data-unicode-version="6.0">😄</gl-emoji></p>') + end + end + it_behaves_like 'group child json' end end |