gitlab-org--gitlab-foss/features/steps/project/merge_requests.rb

290 lines
7.7 KiB
Ruby
Raw Normal View History

class ProjectMergeRequests < Spinach::FeatureSteps
2012-09-10 15:35:03 +00:00
include SharedAuthentication
include SharedProject
include SharedNote
include SharedPaths
include SharedMarkdown
2012-09-10 15:35:03 +00:00
step 'I click link "New Merge Request"' do
2012-10-29 21:23:49 +00:00
click_link "New Merge Request"
end
step 'I click link "Bug NS-04"' do
2012-10-29 21:23:49 +00:00
click_link "Bug NS-04"
end
step 'I click link "All"' do
2012-10-29 21:23:49 +00:00
click_link "All"
end
step 'I click link "Closed"' do
click_link "Closed"
end
step 'I should see merge request "Wiki Feature"' do
within '.merge-request' do
page.should have_content "Wiki Feature"
end
end
step 'I should see closed merge request "Bug NS-04"' do
2014-01-19 18:55:59 +00:00
merge_request = MergeRequest.find_by!(title: "Bug NS-04")
merge_request.closed?.should be_true
2012-10-29 21:23:49 +00:00
page.should have_content "Closed by"
end
step 'I should see merge request "Bug NS-04"' do
2012-10-29 21:23:49 +00:00
page.should have_content "Bug NS-04"
end
step 'I should see "Bug NS-04" in merge requests' do
2012-10-29 21:23:49 +00:00
page.should have_content "Bug NS-04"
end
step 'I should see "Feature NS-03" in merge requests' do
2012-10-29 21:23:49 +00:00
page.should have_content "Feature NS-03"
end
step 'I should not see "Feature NS-03" in merge requests' do
2012-10-29 21:23:49 +00:00
page.should_not have_content "Feature NS-03"
end
2012-10-29 21:23:49 +00:00
step 'I should not see "Bug NS-04" in merge requests' do
2012-10-29 21:23:49 +00:00
page.should_not have_content "Bug NS-04"
end
step 'I click link "Close"' do
within '.page-title' do
click_link "Close"
end
end
step 'I submit new merge request "Wiki Feature"' do
select "fix", from: "merge_request_source_branch"
select "feature", from: "merge_request_target_branch"
click_button "Compare branches"
fill_in "merge_request_title", with: "Wiki Feature"
click_button "Submit merge request"
end
step 'project "Shop" have "Bug NS-04" open merge request' do
2013-02-18 12:49:56 +00:00
create(:merge_request,
2012-10-29 21:23:49 +00:00
title: "Bug NS-04",
Merge Request on forked projects The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-04-25 14:15:33 +00:00
source_project: project,
target_project: project,
source_branch: 'fix',
target_branch: 'master',
author: project.users.first,
description: "# Description header"
)
2012-10-29 21:23:49 +00:00
end
step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
2012-10-29 21:23:49 +00:00
create(:merge_request_with_diffs,
title: "Bug NS-05",
Merge Request on forked projects The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-04-25 14:15:33 +00:00
source_project: project,
target_project: project,
2012-10-29 21:23:49 +00:00
author: project.users.first)
end
step 'project "Shop" have "Feature NS-03" closed merge request' do
2013-02-18 10:43:08 +00:00
create(:closed_merge_request,
2012-10-29 21:23:49 +00:00
title: "Feature NS-03",
Merge Request on forked projects The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-04-25 14:15:33 +00:00
source_project: project,
target_project: project,
2013-02-18 10:43:08 +00:00
author: project.users.first)
2012-10-29 21:23:49 +00:00
end
step 'I switch to the diff tab' do
visit diffs_project_merge_request_path(project, merge_request)
2012-10-29 21:23:49 +00:00
end
step 'I switch to the merge request\'s comments tab' do
visit project_merge_request_path(project, merge_request)
2012-10-29 21:23:49 +00:00
end
step 'I click on the commit in the merge request' do
within '.mr-commits' do
click_link sample_commit.id[0..8]
end
2012-10-29 21:23:49 +00:00
end
step 'I leave a comment on the diff page' do
init_diff_note
leave_comment "One comment to rule them all"
end
2013-01-15 15:12:53 +00:00
step 'I leave a comment on the diff page in commit' do
click_diff_line(sample_commit.line_code)
leave_comment "One comment to rule them all"
2012-10-29 21:23:49 +00:00
end
step 'I leave a comment like "Line is wrong" on diff' do
init_diff_note
leave_comment "Line is wrong"
end
2012-10-29 21:23:49 +00:00
step 'I leave a comment like "Line is wrong" on diff in commit' do
click_diff_line(sample_commit.line_code)
leave_comment "Line is wrong"
2012-10-29 21:23:49 +00:00
end
step 'I should see a discussion has started on diff' do
page.should have_content "#{current_user.name} started a discussion"
page.should have_content sample_commit.line_code_path
2012-10-29 21:23:49 +00:00
page.should have_content "Line is wrong"
end
step 'I should see a discussion has started on commit diff' do
2012-10-29 21:23:49 +00:00
page.should have_content "#{current_user.name} started a discussion on commit"
page.should have_content sample_commit.line_code_path
2012-10-29 21:23:49 +00:00
page.should have_content "Line is wrong"
end
step 'I should see a discussion has started on commit' do
page.should have_content "#{current_user.name} started a discussion on commit"
2012-10-29 21:23:49 +00:00
page.should have_content "One comment to rule them all"
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
Gitlab::Satellite::MergeAction.any_instance.stub(
merge!: true,
)
click_button "Accept Merge Request"
end
step 'I should see merged request' do
within '.issue-box' do
page.should have_content "Merged"
end
end
step 'I click link "Reopen"' do
within '.page-title' do
click_link "Reopen"
end
end
step 'I should see reopened merge request "Bug NS-04"' do
within '.state-label' do
page.should have_content "Open"
end
end
step 'I click link "Hide inline discussion" of the second file' do
within '.files [id^=diff]:nth-child(2)' do
click_link "Diff comments"
end
end
step 'I click link "Show inline discussion" of the second file' do
within '.files [id^=diff]:nth-child(2)' do
click_link "Diff comments"
end
end
step 'I should not see a comment like "Line is wrong" in the second file' do
within '.files [id^=diff]:nth-child(2)' do
page.should_not have_visible_content "Line is wrong"
end
end
step 'I should see a comment like "Line is wrong" in the second file' do
within '.files [id^=diff]:nth-child(2) .note-text' do
page.should have_visible_content "Line is wrong"
end
end
step 'I leave a comment like "Line is correct" on line 12 of the first file' do
init_diff_note_first_file
within(".js-discussion-note-form") do
fill_in "note_note", with: "Line is correct"
click_button "Add Comment"
end
within ".files [id^=diff]:nth-child(1) .note-text" do
page.should have_content "Line is correct"
end
end
step 'I leave a comment like "Line is wrong" on line 39 of the second file' do
init_diff_note_second_file
within(".js-discussion-note-form") do
fill_in "note_note", with: "Line is wrong"
click_button "Add Comment"
end
within ".files [id^=diff]:nth-child(2) .note-text" do
page.should have_content "Line is wrong"
end
end
step 'I should still see a comment like "Line is correct" in the first file' do
within '.files [id^=diff]:nth-child(1) .note-text' do
page.should have_visible_content "Line is correct"
end
end
2014-08-02 15:12:01 +00:00
step 'I unfold diff' do
first('.js-unfold').click
end
step 'I should see additional file lines' do
expect(first('.text-file')).to have_content('.bundle')
end
def project
2014-01-19 18:55:59 +00:00
@project ||= Project.find_by!(name: "Shop")
end
def merge_request
2014-01-19 18:55:59 +00:00
@merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
end
def init_diff_note
click_diff_line(sample_commit.line_code)
end
def leave_comment(message)
within(".js-discussion-note-form") do
fill_in "note_note", with: message
click_button "Add Comment"
end
page.should have_content message
end
def init_diff_note_first_file
click_diff_line(sample_compare.changes[0][:line_code])
end
def init_diff_note_second_file
click_diff_line(sample_compare.changes[1][:line_code])
end
def have_visible_content (text)
have_css("*", text: text, visible: true)
end
def click_diff_line(code)
find("a[data-line-code='#{code}']").click
end
end