diff options
author | Rémy Coutable <remy@rymai.me> | 2016-01-20 22:42:07 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-01-20 22:42:07 +0100 |
commit | 8a829c9738f2d4275b9233a722ffaa2cbb145553 (patch) | |
tree | b62b75f14e1603e2a7cd45a4e82dc4886d882467 /features/steps/project/merge_requests.rb | |
parent | 12da27090f0a8ff4b05023a5216738413dcbe110 (diff) | |
parent | 714f95b2ff68c02eeee9151c9b456bb2afe7eaff (diff) | |
download | gitlab-ce-8a829c9738f2d4275b9233a722ffaa2cbb145553.tar.gz |
Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading
Diffstat (limited to 'features/steps/project/merge_requests.rb')
-rw-r--r-- | features/steps/project/merge_requests.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index c0b9984997c..337893e6209 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -41,7 +41,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should not see "master" branch' do - expect(page).not_to have_content "master" + expect(find('.merge-request-info')).not_to have_content "master" end step 'I should see "other_branch" branch' do @@ -440,6 +440,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end end + step 'I should see "Bug NS-05" at the top' do + expect(page.find('ul.content-list.mr-list li.merge-request:first-child')).to have_content("Bug NS-05") + end + + step 'I should see "Bug NS-04" at the top' do + expect(page.find('ul.content-list.mr-list li.merge-request:first-child')).to have_content("Bug NS-04") + end + def merge_request @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05") end |