2019-10-12 21:52:04 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2019-12-04 20:38:33 +05:30
|
|
|
require 'spec_helper'
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
RSpec.describe 'Merge request < User customizes merge commit message', :js do
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2018-03-17 18:26:18 +05:30
|
|
|
let(:user) { project.creator }
|
2017-08-17 22:00:37 +05:30
|
|
|
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
|
2020-10-24 23:57:45 +05:30
|
|
|
|
2019-03-02 22:35:43 +05:30
|
|
|
let(:textbox) { page.find(:css, '#merge-message-edit', visible: false) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:default_message) do
|
|
|
|
[
|
|
|
|
"Merge branch 'feature' into 'master'",
|
|
|
|
merge_request.title,
|
|
|
|
"Closes #{issue_1.to_reference} and #{issue_2.to_reference}",
|
2018-03-17 18:26:18 +05:30
|
|
|
"See merge request #{merge_request.to_reference(full: true)}"
|
2017-08-17 22:00:37 +05:30
|
|
|
].join("\n\n")
|
|
|
|
end
|
2020-10-24 23:57:45 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:message_with_description) do
|
|
|
|
[
|
|
|
|
"Merge branch 'feature' into 'master'",
|
|
|
|
merge_request.title,
|
|
|
|
merge_request.description,
|
2018-03-17 18:26:18 +05:30
|
|
|
"See merge request #{merge_request.to_reference(full: true)}"
|
2017-08-17 22:00:37 +05:30
|
|
|
].join("\n\n")
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
2018-11-18 11:00:15 +05:30
|
|
|
project.add_maintainer(user)
|
2018-03-17 18:26:18 +05:30
|
|
|
sign_in(user)
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_merge_request_path(project, merge_request)
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'toggles commit message between message with description and without description' do
|
2019-03-02 22:35:43 +05:30
|
|
|
expect(page).not_to have_selector('#merge-message-edit')
|
|
|
|
first('.js-mr-widget-commits-count').click
|
2017-08-17 22:00:37 +05:30
|
|
|
expect(textbox).to be_visible
|
|
|
|
expect(textbox.value).to eq(default_message)
|
|
|
|
|
2019-03-02 22:35:43 +05:30
|
|
|
check('Include merge request description')
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
expect(textbox.value).to eq(message_with_description)
|
|
|
|
|
2019-03-02 22:35:43 +05:30
|
|
|
uncheck('Include merge request description')
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
expect(textbox.value).to eq(default_message)
|
|
|
|
end
|
|
|
|
end
|