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

164 lines
5.0 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
2012-10-29 21:23:49 +00:00
Given 'I click link "New Merge Request"' do
click_link "New Merge Request"
end
2012-10-29 21:23:49 +00:00
Given 'I click link "Bug NS-04"' do
click_link "Bug NS-04"
end
Given 'I click link "All"' do
click_link "All"
end
Given 'I click link "Closed"' do
click_link "Closed"
end
2012-10-29 21:23:49 +00:00
Then 'I should see merge request "Wiki Feature"' do
within '.merge-request' do
page.should have_content "Wiki Feature"
end
end
2012-10-29 21:23:49 +00:00
Then '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
2012-10-29 21:23:49 +00:00
page.should have_content "Closed by"
end
2012-10-29 21:23:49 +00:00
Then 'I should see merge request "Bug NS-04"' do
page.should have_content "Bug NS-04"
end
2012-10-29 21:23:49 +00:00
Then 'I should see "Bug NS-04" in merge requests' do
page.should have_content "Bug NS-04"
end
2012-10-29 21:23:49 +00:00
Then 'I should see "Feature NS-03" in merge requests' do
page.should have_content "Feature NS-03"
end
2012-10-29 21:23:49 +00:00
And 'I should not see "Feature NS-03" in merge requests' do
page.should_not have_content "Feature NS-03"
end
2012-10-29 21:23:49 +00:00
And 'I should not see "Bug NS-04" in merge requests' do
page.should_not have_content "Bug NS-04"
end
2012-10-29 21:23:49 +00:00
And 'I click link "Close"' do
click_link "Close"
end
And '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
# by the time the "select" for "notes_refactoring" is executed
select project.path_with_namespace, from: "merge_request_target_project_id"
select "master", from: "merge_request_source_branch"
find(:select, "merge_request_target_project_id", {}).value.should == project.id.to_s
find(:select, "merge_request_source_project_id", {}).value.should == project.id.to_s
# using "notes_refactoring" because "Bug NS-04" uses master/stable,
# this will fail merge_request validation if the branches are the same
find(:select, "merge_request_target_branch", {}).find(:option, "notes_refactoring", {}).value.should == "notes_refactoring"
select "notes_refactoring", from: "merge_request_target_branch"
click_button "Submit merge request"
end
And '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,
2012-10-29 21:23:49 +00:00
author: project.users.first)
end
And 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
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
And '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
And '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
And '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
And 'I click on the first commit in the merge request' do
click_link merge_request.commits.first.short_id(8)
2012-10-29 21:23:49 +00:00
end
And 'I leave a comment on the diff page' do
init_diff_note
2013-01-15 15:12:53 +00:00
2013-01-15 12:28:04 +00:00
within('.js-temp-notes-holder') do
2012-10-29 21:23:49 +00:00
fill_in "note_note", with: "One comment to rule them all"
click_button "Add Comment"
end
end
And 'I leave a comment like "Line is wrong" on line 185 of the first file' do
init_diff_note
2012-10-29 21:23:49 +00:00
2013-01-15 12:28:04 +00:00
within(".js-temp-notes-holder") do
2012-10-29 21:23:49 +00:00
fill_in "note_note", with: "Line is wrong"
click_button "Add Comment"
2013-01-15 12:28:04 +00:00
sleep 0.05
2012-10-29 21:23:49 +00:00
end
end
Then '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"
2013-04-03 19:04:26 +00:00
page.should have_content "app/assets/stylesheets/tree.scss:L185"
2012-10-29 21:23:49 +00:00
page.should have_content "Line is wrong"
end
Then 'I should see a discussion has started on commit bcf03b5de6c:L185' do
page.should have_content "#{current_user.name} started a discussion on commit"
2013-04-03 19:04:26 +00:00
page.should have_content "app/assets/stylesheets/tree.scss:L185"
2012-10-29 21:23:49 +00:00
page.should have_content "Line is wrong"
end
Then 'I should see a discussion has started on commit bcf03b5de6c' do
2013-01-15 15:12:53 +00:00
page.should have_content "#{current_user.name} started a discussion on commit bcf03b5de6c"
2012-10-29 21:23:49 +00:00
page.should have_content "One comment to rule them all"
2013-04-03 19:04:26 +00:00
page.should have_content "app/assets/stylesheets/tree.scss:L185"
end
def project
@project ||= Project.find_by_name!("Shop")
end
def merge_request
@merge_request ||= MergeRequest.find_by_title!("Bug NS-05")
end
def init_diff_note
find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185"]').click
end
end