From f7d69a74a805f52fe10b42459ede587965ec1926 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Fri, 24 Mar 2017 19:10:57 -0500
Subject: Fix up emoji tests that should have failed :/

Some discussion,
https://gitlab.slack.com/archives/C0GQHHPGW/p1490398531185144
 -> MR to fix failing emoji test:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10230
---
 features/steps/project/issues/award_emoji.rb | 2 +-
 features/steps/shared/diff_note.rb           | 4 ++--
 features/steps/shared/markdown.rb            | 2 +-
 features/steps/shared/note.rb                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'features')

diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 1762d5bdf95..e55dc2913c3 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -45,7 +45,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
   end
 
   step 'I have new comment with emoji added' do
-    expect(page).to have_selector ".emoji[title=':smile:']"
+    expect(page).to have_selector 'gl-emoji[data-name="smile"]'
   end
 
   step 'I have award added' do
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 11fa85ed2fe..071aa2e3eff 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -196,7 +196,7 @@ module SharedDiffNote
   step 'The diff comment preview tab should display rendered Markdown' do
     page.within(diff_file_selector) do
       find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_css('img.emoji', visible: true)
+      expect(find('.js-md-preview')).to have_css('gl-emoji', visible: true)
     end
   end
 
@@ -210,7 +210,7 @@ module SharedDiffNote
 
   step 'I should see a diff comment with an emoji image' do
     page.within("#{diff_file_selector} .note") do
-      expect(page).to have_xpath("//img[@alt=':smile:']")
+      expect(page).to have_xpath("//gl-emoji[@data-name='smile']")
     end
   end
 
diff --git a/features/steps/shared/markdown.rb b/features/steps/shared/markdown.rb
index a036d9b884f..875d27d9383 100644
--- a/features/steps/shared/markdown.rb
+++ b/features/steps/shared/markdown.rb
@@ -40,7 +40,7 @@ module SharedMarkdown
   step 'The Markdown preview tab should display rendered Markdown' do
     page.within('.gfm-form') do
       find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_css('img.emoji', visible: true)
+      expect(find('.js-md-preview')).to have_css('gl-emoji', visible: true)
     end
   end
 
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 1870f6bc0c3..fd925e0d447 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -95,7 +95,7 @@ module SharedNote
   step 'The comment preview tab should be display rendered Markdown' do
     page.within(".js-main-target-form") do
       find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_css('img.emoji', visible: true)
+      expect(find('.js-md-preview')).to have_css('gl-emoji', visible: true)
     end
   end
 
-- 
cgit v1.2.3