diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-19 14:43:52 +0200 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-19 14:43:52 +0200 |
commit | c8265f13ca0ad7d1bd04a699b61b3aa2f3d1e4e7 (patch) | |
tree | a646a24601d8164946c249fbc9cf8482d4b5dabf /features/steps/project/merge_requests.rb | |
parent | 01b70c6c297c8be013b59c68a0c6b93318dcd021 (diff) | |
parent | 4f0302f00ef0c51b67b73429ace0a632971b7f1b (diff) | |
download | gitlab-ce-c8265f13ca0ad7d1bd04a699b61b3aa2f3d1e4e7.tar.gz |
Merge branch 'master' into gitlab_intro_docs
Diffstat (limited to 'features/steps/project/merge_requests.rb')
-rw-r--r-- | features/steps/project/merge_requests.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index df4259b9ddf..91fe19dd477 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -16,10 +16,18 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps click_link "Bug NS-04" end + step 'I click link "Feature NS-05"' do + click_link "Feature NS-05" + end + step 'I click link "All"' do click_link "All" end + step 'I click link "Merged"' do + click_link "Merged" + end + step 'I click link "Closed"' do click_link "Closed" end @@ -40,6 +48,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps expect(page).to have_content "Bug NS-04" end + step 'I should see merge request "Feature NS-05"' do + expect(page).to have_content "Feature NS-05" + end + step 'I should not see "master" branch' do expect(find('.merge-request-info')).not_to have_content "master" end @@ -120,6 +132,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps author: project.users.first) end + step 'project "Shop" have "Feature NS-05" merged merge request' do + create(:merged_merge_request, + title: "Feature NS-05", + source_project: project, + target_project: project, + author: project.users.first) + end + step 'project "Shop" have "Bug NS-07" open merge request with rebased branch' do create(:merge_request, :rebased, title: "Bug NS-07", |