diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-30 13:21:29 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-30 13:21:29 +0300 |
commit | 7418873b41acb142d33443fcbbe45e4ca6bdfd08 (patch) | |
tree | d6086ee6ea4131406a5686638ff69ca51b6956bf /features/steps/project/issues | |
parent | a6e312bf1dd01aa653761c5bf1e848df9707c0cb (diff) | |
parent | 2778dec131c2afac9fcdb2c42365b69099a5ae5b (diff) |
Merge branch 'master' into revert-c676283b
Diffstat (limited to 'features/steps/project/issues')
-rw-r--r-- | features/steps/project/issues/award_emoji.rb | 2 | ||||
-rw-r--r-- | features/steps/project/issues/issues.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb index 1498f899cf5..cbe5738e7e4 100644 --- a/features/steps/project/issues/award_emoji.rb +++ b/features/steps/project/issues/award_emoji.rb @@ -48,7 +48,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps 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).to have_css(".js-emoji-btn.active[data-original-title='me']") + expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']") end end diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index b785e15f70e..99bd2ac3bc0 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -45,6 +45,8 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps step 'I click link "All"' do click_link "All" + # Waits for load + expect(find('.issues-state-filters > .active')).to have_content 'All' end step 'I click link "Release 0.4"' do @@ -298,7 +300,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end step 'I fill in issue search with \'Rock and roll\'' do - filter_issue 'Description for issue' + filter_issue 'Rock and roll' end step 'I should see \'Bugfix1\' in issues' do |