Commit f7d69a74 authored by Eric Eastwood's avatar Eric Eastwood
Browse files

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
parent 34870e16
......@@ -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
......
......@@ -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
......
......@@ -40,7 +40,7 @@ def header_should_have_correct_id_and_link(level, text, id, parent = ".wiki")
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
......
......@@ -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
......
......@@ -45,7 +45,7 @@
page.within('.broadcast-message-preview') do
expect(page).to have_selector('strong', text: 'Markdown')
expect(page).to have_selector('img.emoji')
expect(page).to have_selector('gl-emoji[data-name="tada"]')
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment