diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-14 13:49:54 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-14 13:49:54 +0400 |
commit | 9247490109b9d4e4691d304e7bfb4bca6d54e209 (patch) | |
tree | 6e5f0c722a0be665ebb866abaaf09322b660ab49 /features | |
parent | 09d5868c2286f927ce2cc23dfcc2c446723985b3 (diff) |
Tests for accept MR with custom message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r-- | features/project/merge_requests.feature | 10 | ||||
-rw-r--r-- | features/steps/project/project_merge_requests.rb | 71 |
2 files changed, 57 insertions, 24 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 63f27c3acc3..4e4ac1a68e4 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -67,3 +67,13 @@ Feature: Project Merge Requests And I leave a comment on the diff page And I switch to the merge request's comments tab Then I should see a discussion has started on commit bcf03b5de6c + + @javascript + Scenario: I accept merge request with custom commit message + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And merge request "Bug NS-05" is mergeable + And I visit merge request page "Bug NS-05" + And merge request is mergeable + Then I modify merge commit message + And I accept this merge request + Then I should see merged request diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb index 7b0f8cc7ad2..8ef952cf3d1 100644 --- a/features/steps/project/project_merge_requests.rb +++ b/features/steps/project/project_merge_requests.rb @@ -4,60 +4,60 @@ class ProjectMergeRequests < Spinach::FeatureSteps include SharedNote include SharedPaths - Given 'I click link "New Merge Request"' do + step 'I click link "New Merge Request"' do click_link "New Merge Request" end - Given 'I click link "Bug NS-04"' do + step 'I click link "Bug NS-04"' do click_link "Bug NS-04" end - Given 'I click link "All"' do + step 'I click link "All"' do click_link "All" end - Given 'I click link "Closed"' do + step 'I click link "Closed"' do click_link "Closed" end - Then 'I should see merge request "Wiki Feature"' do + step 'I should see merge request "Wiki Feature"' do within '.merge-request' do page.should have_content "Wiki Feature" end end - Then 'I should see closed merge request "Bug NS-04"' do + step 'I should see closed merge request "Bug NS-04"' do merge_request = MergeRequest.find_by_title!("Bug NS-04") merge_request.closed?.should be_true page.should have_content "Closed by" end - Then 'I should see merge request "Bug NS-04"' do + step 'I should see merge request "Bug NS-04"' do page.should have_content "Bug NS-04" end - Then 'I should see "Bug NS-04" in merge requests' do + step 'I should see "Bug NS-04" in merge requests' do page.should have_content "Bug NS-04" end - Then 'I should see "Feature NS-03" in merge requests' do + step 'I should see "Feature NS-03" in merge requests' do page.should have_content "Feature NS-03" end - And 'I should not see "Feature NS-03" in merge requests' do + step 'I should not see "Feature NS-03" in merge requests' do page.should_not have_content "Feature NS-03" end - And 'I should not see "Bug NS-04" in merge requests' do + step 'I should not see "Bug NS-04" in merge requests' do page.should_not have_content "Bug NS-04" end - And 'I click link "Close"' do + step 'I click link "Close"' do click_link "Close" end - And 'I submit new merge request "Wiki Feature"' do + step 'I submit new merge request "Wiki Feature"' do fill_in "merge_request_title", with: "Wiki Feature" # this must come first, so that the target branch is set @@ -76,7 +76,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps click_button "Submit merge request" end - And 'project "Shop" have "Bug NS-04" open merge request' do + step 'project "Shop" have "Bug NS-04" open merge request' do create(:merge_request, title: "Bug NS-04", source_project: project, @@ -84,7 +84,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps author: project.users.first) end - And 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do + step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do create(:merge_request_with_diffs, title: "Bug NS-05", source_project: project, @@ -92,7 +92,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps author: project.users.first) end - And 'project "Shop" have "Feature NS-03" closed merge request' do + step 'project "Shop" have "Feature NS-03" closed merge request' do create(:closed_merge_request, title: "Feature NS-03", source_project: project, @@ -100,19 +100,19 @@ class ProjectMergeRequests < Spinach::FeatureSteps author: project.users.first) end - And 'I switch to the diff tab' do + step 'I switch to the diff tab' do visit diffs_project_merge_request_path(project, merge_request) end - And 'I switch to the merge request\'s comments tab' do + step 'I switch to the merge request\'s comments tab' do visit project_merge_request_path(project, merge_request) end - And 'I click on the first commit in the merge request' do + step 'I click on the first commit in the merge request' do click_link merge_request.commits.first.short_id(8) end - And 'I leave a comment on the diff page' do + step 'I leave a comment on the diff page' do init_diff_note within('.js-discussion-note-form') do @@ -125,7 +125,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps end end - And 'I leave a comment like "Line is wrong" on line 185 of the first file' do + step 'I leave a comment like "Line is wrong" on line 185 of the first file' do init_diff_note within(".js-discussion-note-form") do @@ -138,24 +138,47 @@ class ProjectMergeRequests < Spinach::FeatureSteps end end - Then 'I should see a discussion has started on line 185' do + step 'I should see a discussion has started on line 185' do page.should have_content "#{current_user.name} started a discussion on this merge request diff" page.should have_content "app/assets/stylesheets/tree.scss:L185" page.should have_content "Line is wrong" end - Then 'I should see a discussion has started on commit bcf03b5de6c:L185' do + step 'I should see a discussion has started on commit bcf03b5de6c:L185' do page.should have_content "#{current_user.name} started a discussion on commit" page.should have_content "app/assets/stylesheets/tree.scss:L185" page.should have_content "Line is wrong" end - Then 'I should see a discussion has started on commit bcf03b5de6c' do + step 'I should see a discussion has started on commit bcf03b5de6c' do page.should have_content "#{current_user.name} started a discussion on commit bcf03b5de6c" page.should have_content "One comment to rule them all" page.should have_content "app/assets/stylesheets/tree.scss:L185" end + step 'merge request is mergeable' do + page.should have_content 'You can accept this request automatically' + end + + step 'I modify merge commit message' do + find('.modify-merge-commit-link').click + fill_in 'merge_commit_message', with: "wow such merge" + end + + step 'merge request "Bug NS-05" is mergeable' do + merge_request.mark_as_mergeable + end + + step 'I accept this merge request' do + click_button "Accept Merge Request" + end + + step 'I should see merged request' do + within '.page-title' do + page.should have_content "Merged" + end + end + def project @project ||= Project.find_by_name!("Shop") end |