2016-12-10 11:58:15 +00:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-10-03 08:35:01 +00:00
|
|
|
feature 'Clicking toggle commit message link', :js do
|
2016-12-10 11:58:15 +00:00
|
|
|
let(:user) { create(:user) }
|
2017-07-26 21:52:10 +00:00
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2016-12-10 11:58:15 +00:00
|
|
|
let(:issue_1) { create(:issue, project: project)}
|
|
|
|
let(:issue_2) { create(:issue, project: project)}
|
|
|
|
let(:merge_request) do
|
|
|
|
create(
|
|
|
|
:merge_request,
|
|
|
|
:simple,
|
|
|
|
source_project: project,
|
|
|
|
description: "Description\n\nclosing #{issue_1.to_reference}, #{issue_2.to_reference}"
|
|
|
|
)
|
|
|
|
end
|
|
|
|
let(:textbox) { page.find(:css, '.js-commit-message', visible: false) }
|
|
|
|
let(:default_message) do
|
|
|
|
[
|
|
|
|
"Merge branch 'feature' into 'master'",
|
|
|
|
merge_request.title,
|
2016-12-13 13:00:00 +00:00
|
|
|
"Closes #{issue_1.to_reference} and #{issue_2.to_reference}",
|
2017-08-13 12:39:30 +00:00
|
|
|
"See merge request #{merge_request.to_reference(full: true)}"
|
2016-12-10 11:58:15 +00:00
|
|
|
].join("\n\n")
|
|
|
|
end
|
|
|
|
let(:message_with_description) do
|
|
|
|
[
|
|
|
|
"Merge branch 'feature' into 'master'",
|
|
|
|
merge_request.title,
|
|
|
|
merge_request.description,
|
2017-08-13 12:39:30 +00:00
|
|
|
"See merge request #{merge_request.to_reference(full: true)}"
|
2016-12-10 11:58:15 +00:00
|
|
|
].join("\n\n")
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
|
|
|
project.team << [user, :master]
|
|
|
|
|
2017-06-21 23:44:10 +00:00
|
|
|
sign_in user
|
2016-12-10 11:58:15 +00:00
|
|
|
|
2017-07-06 16:20:50 +00:00
|
|
|
visit project_merge_request_path(project, merge_request)
|
2016-12-10 11:58:15 +00:00
|
|
|
|
2017-05-09 04:15:34 +00:00
|
|
|
expect(page).not_to have_selector('.js-commit-message')
|
2017-03-14 05:02:30 +00:00
|
|
|
click_button "Modify commit message"
|
2016-12-10 11:58:15 +00:00
|
|
|
expect(textbox).to be_visible
|
|
|
|
end
|
|
|
|
|
|
|
|
it "toggles commit message between message with description and without description " do
|
|
|
|
expect(textbox.value).to eq(default_message)
|
|
|
|
|
|
|
|
click_link "Include description in commit message"
|
|
|
|
|
|
|
|
expect(textbox.value).to eq(message_with_description)
|
|
|
|
|
|
|
|
click_link "Don't include description in commit message"
|
|
|
|
|
|
|
|
expect(textbox.value).to eq(default_message)
|
|
|
|
end
|
|
|
|
end
|