diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-18 22:50:28 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-18 22:50:28 +0100 |
| commit | aba9cc6f227a670390cbac0c5da97784afefc5ee (patch) | |
| tree | 4eaafa3fb7fc948361a63b8b24170d69bddeeced /features | |
| parent | 883b96ab6a77175d9bac7f03c325428327359cdd (diff) | |
| parent | 717366d28da11acc6dbe60301bf7e2394400b3c1 (diff) | |
| download | gitlab-ce-aba9cc6f227a670390cbac0c5da97784afefc5ee.tar.gz | |
Merge branch 'master' into expiration-date-on-memberships
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/issues/award_emoji.rb | 2 | ||||
| -rw-r--r-- | features/steps/project/issues/issues.rb | 2 |
2 files changed, 2 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 056462a7152..e21f76d00d9 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -299,7 +299,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 |