summaryrefslogtreecommitdiff
path: root/spec/support/matchers
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-02-27 22:44:34 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-03-06 12:54:46 -0600
commite6fc0207cb37666cdf606c03641f2afbb5646213 (patch)
tree8a596255b77da1b3e8a5a6349a80fb72aa8ac678 /spec/support/matchers
parentf911b948e9b376e65f5d5bf7e6d09b32e3c995c8 (diff)
downloadgitlab-ce-e6fc0207cb37666cdf606c03641f2afbb5646213.tar.gz
Use native unicode emojis
- gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474
Diffstat (limited to 'spec/support/matchers')
-rw-r--r--spec/support/matchers/markdown_matchers.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/matchers/markdown_matchers.rb b/spec/support/matchers/markdown_matchers.rb
index 97b8b342eb2..13fc619d647 100644
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
@@ -26,10 +26,10 @@ module MarkdownMatchers
set_default_markdown_messages
match do |actual|
- expect(actual).to have_selector('img.emoji', count: 10)
+ expect(actual).to have_selector('gl-emoji', count: 10)
- image = actual.at_css('img.emoji')
- expect(image['src'].to_s).to start_with(Gitlab.config.gitlab.url + '/assets')
+ emoji_element = actual.at_css('gl-emoji')
+ expect(emoji_element['data-fallback-src'].to_s).to start_with('/assets')
end
end