summaryrefslogtreecommitdiff
path: root/features/steps
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-01 13:00:26 +0000
committerPhil Hughes <me@iamphill.com>2016-03-11 09:02:43 +0000
commita7e76a6119b4f51bdb29ea1420c151081cd12d77 (patch)
treefacf815c82a88f28f549be4b24cbfba60485c320 /features/steps
parent5e145918b4dc20672ca212d094a73b87476d1db5 (diff)
downloadgitlab-ce-a7e76a6119b4f51bdb29ea1420c151081cd12d77.tar.gz
Updated award emoji tests
Diffstat (limited to 'features/steps')
-rw-r--r--features/steps/project/issues/award_emoji.rb26
1 files changed, 13 insertions, 13 deletions
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 277c63914d1..9f0f1812b46 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -10,7 +10,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
step 'I click the thumbsup award Emoji' do
page.within '.awards' do
- thumbsup = page.find('.award .emoji-1F44D')
+ thumbsup = page.first('.award-control')
thumbsup.click
thumbsup.hover
sleep 0.3
@@ -18,23 +18,23 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end
step 'I click to emoji-picker' do
- page.within '.awards-controls' do
- page.find('.add-award').click
+ page.within '.awards' do
+ page.find('.js-add-award').click
end
end
step 'I click to emoji in the picker' do
page.within '.emoji-menu-content' do
- page.first('.emoji-icon').click
+ page.first('.js-emoji-btn').click
end
end
step 'I can remove it by clicking to icon' do
page.within '.awards' do
expect do
- page.find('.award.active').click
+ page.find('.js-emoji-btn.active').click
sleep 0.3
- end.to change{ page.all(".award").size }.from(3).to(2)
+ end.to change{ page.all(".award-control.js-emoji-btn").size }.from(3).to(2)
end
end
@@ -49,23 +49,23 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
sleep 0.2
page.within '.awards' do
- expect(page).to have_selector '.award'
- expect(page.find('.award.active .counter')).to have_content '1'
- expect(page.find('.award.active')['data-original-title']).to eq('me')
+ expect(page).to have_selector '.js-emoji-btn'
+ expect(page.find('.js-emoji-btn.active .js-counter')).to have_content '1'
+ expect(page.find('.js-emoji-btn.active')['data-original-title']).to eq('me')
end
end
step 'I have no awards added' do
page.within '.awards' do
- expect(page).to have_selector '.award'
- expect(page.all('.award').size).to eq(2)
+ expect(page).to have_selector '.award-control.js-emoji-btn'
+ expect(page.all('.award-control.js-emoji-btn').size).to eq(2)
# Check tooltip data
- page.all('.award').each do |element|
+ page.all('.award-control.js-emoji-btn').each do |element|
expect(element['title']).to eq("")
end
- page.all('.award .counter').each do |element|
+ page.all('.award-control .js-counter').each do |element|
expect(element).to have_content '0'
end
end