1 files changed, 54 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb b/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb
new file mode 100644
index 00000000000..e1e70b6d260
--- /dev/null
+++ b/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb
@@ -0,0 +1,54 @@
+require 'rails_helper'
+
+describe 'Merge request < User customizes merge commit message', :js do
+  let(:project) { create(:project, :public, :repository) }
+  let(:user) { project.creator }
+  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,
+      "Closes #{issue_1.to_reference} and #{issue_2.to_reference}",
+      "See merge request #{merge_request.to_reference(full: true)}"
+    ].join("\n\n")
+  end
+  let(:message_with_description) do
+    [
+      "Merge branch 'feature' into 'master'",
+      merge_request.title,
+      merge_request.description,
+      "See merge request #{merge_request.to_reference(full: true)}"
+    ].join("\n\n")
+  end
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+    visit project_merge_request_path(project, merge_request)
+  end
+
+  it 'toggles commit message between message with description and without description' do
+    expect(page).not_to have_selector('.js-commit-message')
+    click_button "Modify commit message"
+    expect(textbox).to be_visible
+    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