From edf26a0931b094c1e693b51d84f4db7d0b78fc2e Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 16 Aug 2018 14:06:56 +0200 Subject: [PATCH] uses emoji version for tests (#6277) --- test/javascripts/acceptance/emoji-test.js.es6 | 9 +++++---- test/javascripts/acceptance/topic-test.js.es6 | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js.es6 index a01b623d1a5..48ac7f9bcc4 100644 --- a/test/javascripts/acceptance/emoji-test.js.es6 +++ b/test/javascripts/acceptance/emoji-test.js.es6 @@ -1,3 +1,4 @@ +import { IMAGE_VERSION as v } from "pretty-text/emoji"; import { acceptance } from "helpers/qunit-helpers"; acceptance("Emoji", { loggedIn: true }); @@ -11,7 +12,7 @@ QUnit.test("emoji is cooked properly", async assert => { find(".d-editor-preview:visible") .html() .trim(), - '

this is an emoji :blonde_woman:

' + `

this is an emoji :blonde_woman:

` ); await click("#reply-control .btn.create"); @@ -19,7 +20,7 @@ QUnit.test("emoji is cooked properly", async assert => { find(".topic-post:last .cooked p") .html() .trim(), - 'this is an emoji :blonde_woman:' + `this is an emoji :blonde_woman:` ); }); @@ -32,7 +33,7 @@ QUnit.test("skin toned emoji is cooked properly", async assert => { find(".d-editor-preview:visible") .html() .trim(), - '

this is an emoji :blonde_woman:t5:

' + `

this is an emoji :blonde_woman:t5:

` ); await click("#reply-control .btn.create"); @@ -40,6 +41,6 @@ QUnit.test("skin toned emoji is cooked properly", async assert => { find(".topic-post:last .cooked p") .html() .trim(), - 'this is an emoji :blonde_woman:t5:' + `this is an emoji :blonde_woman:t5:` ); }); diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6 index f8e8f9ab581..bb4483c90cd 100644 --- a/test/javascripts/acceptance/topic-test.js.es6 +++ b/test/javascripts/acceptance/topic-test.js.es6 @@ -1,4 +1,6 @@ import { acceptance } from "helpers/qunit-helpers"; +import { IMAGE_VERSION as v } from "pretty-text/emoji"; + acceptance("Topic", { loggedIn: true, pretend(server, helper) { @@ -181,7 +183,7 @@ QUnit.test("Updating the topic title with emojis", async assert => { find(".fancy-title") .html() .trim(), - 'emojis title bike blonde_woman:t6', + `emojis title bike blonde_woman:t6`, "it displays the new title with emojis" ); });