summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-14 19:57:25 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-14 19:57:25 +0000
commit29b186e49d6873f6e5173e940436fc35737ce4c0 (patch)
treefdec827b7533cc2319aaab60e9c691ed2de6a239
parent3211d1cb760268bb351f288d3ea42cf76b8e8c6d (diff)
parenta181722ae4dc0b1bb564d34b30e30f823cc72bc0 (diff)
downloadgitlab-ce-29b186e49d6873f6e5173e940436fc35737ce4c0.tar.gz
Merge branch 'improve-award-emoji-spec' into 'master'
Improve award emoji test reliability and eliminate sleeps Closes #14129 See merge request !3195
-rw-r--r--features/steps/project/issues/award_emoji.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 135e1d016ae..ce2554bc80d 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -13,7 +13,6 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
thumbsup = page.first('.award-control')
thumbsup.click
thumbsup.hover
- sleep 0.3
end
end
@@ -46,12 +45,10 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end
step 'I have award added' do
- sleep 0.2
-
page.within '.awards' do
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')
+ expect(page).to have_css(".js-emoji-btn.active[data-original-title='me']")
end
end