164 lines
5.0 KiB
Ruby
164 lines
5.0 KiB
Ruby
class ProjectMergeRequests < Spinach::FeatureSteps
|
|
include SharedAuthentication
|
|
include SharedProject
|
|
include SharedNote
|
|
include SharedPaths
|
|
|
|
Given 'I click link "New Merge Request"' do
|
|
click_link "New Merge Request"
|
|
end
|
|
|
|
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
|
|
|
|
Then '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
|
|
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
|
|
page.should have_content "Bug NS-04"
|
|
end
|
|
|
|
Then '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
|
|
page.should have_content "Feature NS-03"
|
|
end
|
|
|
|
And '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
|
|
page.should_not have_content "Bug NS-04"
|
|
end
|
|
|
|
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
|
|
create(:merge_request,
|
|
title: "Bug NS-04",
|
|
source_project: project,
|
|
target_project: project,
|
|
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",
|
|
source_project: project,
|
|
target_project: project,
|
|
author: project.users.first)
|
|
end
|
|
|
|
And 'project "Shop" have "Feature NS-03" closed merge request' do
|
|
create(:closed_merge_request,
|
|
title: "Feature NS-03",
|
|
source_project: project,
|
|
target_project: project,
|
|
author: project.users.first)
|
|
end
|
|
|
|
And '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
|
|
visit project_merge_request_path(project, merge_request)
|
|
end
|
|
|
|
And '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
|
|
init_diff_note
|
|
|
|
within('.js-temp-notes-holder') do
|
|
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
|
|
|
|
within(".js-temp-notes-holder") do
|
|
fill_in "note_note", with: "Line is wrong"
|
|
click_button "Add Comment"
|
|
sleep 0.05
|
|
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"
|
|
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
|
|
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
|
|
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
|
|
|
|
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
|