Merge branch 'fix_wiki_commit_message' into 'master'

Fix wiki commit message

Closes #20389

See merge request !10464

4 files changed, 33 insertions, 1 deletions

diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index c52527332bc..0d2cd4a7476 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,3 +1,5 @@
+- commit_message = @page.persisted? ? "Update #{@page.title}" : "Create #{@page.title}"
+
 = form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form common-note-form prepend-top-default js-quick-submit' } do |f|
   = form_errors(@page)
 
@@ -28,7 +30,7 @@
 
   .form-group
     = f.label :commit_message, class: 'control-label'
-    .col-sm-10= f.text_field :message, class: 'form-control', rows: 18
+    .col-sm-10= f.text_field :message, class: 'form-control', rows: 18, value: commit_message
 
   .form-actions
     - if @page && @page.persisted?
diff --git a/changelogs/unreleased/fix_wiki_commit_message.yml b/changelogs/unreleased/fix_wiki_commit_message.yml
new file mode 100644
index 00000000000..e5cd398b4b5
--- /dev/null
+++ b/changelogs/unreleased/fix_wiki_commit_message.yml
@@ -0,0 +1,4 @@
+---
+title: Fix wiki commit message
+merge_request: 10464
+author: blackst0ne
diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
index fff8b9f3447..7bdaafd1beb 100644
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
@@ -15,6 +15,10 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
     let(:project) { create(:project, namespace: user.namespace) }
 
     context 'when wiki is empty' do
+      scenario 'commit message field has value "Create home"' do
+        expect(page).to have_field('wiki[message]', with: 'Create home')
+      end
+
       scenario 'directly from the wiki home page' do
         fill_in :wiki_content, with: 'My awesome wiki!'
         click_button 'Create page'
@@ -37,6 +41,9 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
           fill_in :new_wiki_path, with: 'foo'
           click_button 'Create Page'
 
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Create foo')
+
           fill_in :wiki_content, with: 'My awesome wiki!'
           click_button 'Create page'
 
@@ -51,6 +58,9 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
           fill_in :new_wiki_path, with: 'Spaces in the name'
           click_button 'Create Page'
 
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Create spaces in the name')
+
           fill_in :wiki_content, with: 'My awesome wiki!'
           click_button 'Create page'
 
@@ -65,6 +75,9 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
           fill_in :new_wiki_path, with: 'hyphens-in-the-name'
           click_button 'Create Page'
 
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Create hyphens in the name')
+
           fill_in :wiki_content, with: 'My awesome wiki!'
           click_button 'Create page'
 
@@ -80,6 +93,10 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
     let(:project) { create(:project, namespace: create(:group, :public)) }
 
     context 'when wiki is empty' do
+      scenario 'commit message field has value "Create home"' do
+        expect(page).to have_field('wiki[message]', with: 'Create home')
+      end
+
       scenario 'directly from the wiki home page' do
         fill_in :wiki_content, with: 'My awesome wiki!'
         click_button 'Create page'
@@ -101,6 +118,9 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
         fill_in :new_wiki_path, with: 'foo'
         click_button 'Create Page'
 
+        # Commit message field should have correct value.
+        expect(page).to have_field('wiki[message]', with: 'Create foo')
+
         fill_in :wiki_content, with: 'My awesome wiki!'
         click_button 'Create page'
 
diff --git a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
index aedc0333cb9..86cf520ea80 100644
--- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
@@ -19,6 +19,9 @@ feature 'Projects > Wiki > User updates wiki page', feature: true do
       scenario 'success when the wiki content is not empty' do
         click_link 'Edit'
 
+        # Commit message field should have correct value.
+        expect(page).to have_field('wiki[message]', with: 'Update home')
+
         fill_in :wiki_content, with: 'My awesome wiki!'
         click_button 'Save changes'
 
@@ -48,6 +51,9 @@ feature 'Projects > Wiki > User updates wiki page', feature: true do
     scenario 'the home page' do
       click_link 'Edit'
 
+      # Commit message field should have correct value.
+      expect(page).to have_field('wiki[message]', with: 'Update home')
+
       fill_in :wiki_content, with: 'My awesome wiki!'
       click_button 'Save changes'