Merge branch 'wiki_title' into 'master'

add feature rename wiki title

Closes #27800

See merge request !10069

4 files changed, 40 insertions, 15 deletions

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 e3739a705bf..64a80aec205 100644
--- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
@@ -55,7 +55,7 @@ feature 'Projects > Wiki > User updates wiki page' do
     scenario 'page has been updated since the user opened the edit page' do
       click_link 'Edit'
 
-      wiki_page.update('Update')
+      wiki_page.update(content: 'Update')
 
       click_button 'Save changes'
 
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 6e33431bbe9..953df7746eb 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -223,7 +223,12 @@ describe ProjectWiki do
     before do
       create_page("update-page", "some content")
       @gollum_page = subject.wiki.paged("update-page")
-      subject.update_page(@gollum_page, "some other content", :markdown, "updated page")
+      subject.update_page(
+        @gollum_page,
+        content: "some other content",
+        format: :markdown,
+        message: "updated page"
+      )
       @page = subject.pages.first.page
     end
 
@@ -240,7 +245,12 @@ describe ProjectWiki do
     end
 
     it 'updates project activity' do
-      subject.update_page(@gollum_page, 'Yet more content', :markdown, 'Updated page again')
+      subject.update_page(
+        @gollum_page,
+        content: 'Yet more content',
+        format: :markdown,
+        message: 'Updated page again'
+      )
 
       project.reload
 
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index b7eb412a8de..40a222be24d 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -178,12 +178,12 @@ describe WikiPage do
       end
 
       it "updates the content of the page" do
-        @page.update("new content")
+        @page.update(content: "new content")
         @page = wiki.find_page(title)
       end
 
       it "returns true" do
-        expect(@page.update("more content")).to be_truthy
+        expect(@page.update(content: "more content")).to be_truthy
       end
     end
   end
@@ -195,29 +195,42 @@ describe WikiPage do
     end
 
     after do
-      destroy_page("Update")
+      destroy_page(@page.title)
     end
 
     context "with valid attributes" do
       it "updates the content of the page" do
-        @page.update("new content")
+        new_content = "new content"
+
+        @page.update(content: new_content)
         @page = wiki.find_page("Update")
+
+        expect(@page.content).to eq("new content")
+      end
+
+      it "updates the title of the page" do
+        new_title = "Index v.1.2.4"
+
+        @page.update(title: new_title)
+        @page = wiki.find_page(new_title)
+
+        expect(@page.title).to eq(new_title)
       end
 
       it "returns true" do
-        expect(@page.update("more content")).to be_truthy
+        expect(@page.update(content: "more content")).to be_truthy
       end
     end
 
     context 'with same last commit sha' do
       it 'returns true' do
-        expect(@page.update('more content', last_commit_sha: @page.last_commit_sha)).to be_truthy
+        expect(@page.update(content: 'more content', last_commit_sha: @page.last_commit_sha)).to be_truthy
       end
     end
 
     context 'with different last commit sha' do
       it 'raises exception' do
-        expect { @page.update('more content', last_commit_sha: 'xxx') }.to raise_error(WikiPage::PageChangedError)
+        expect { @page.update(content: 'more content', last_commit_sha: 'xxx') }.to raise_error(WikiPage::PageChangedError)
       end
     end
   end
@@ -249,7 +262,7 @@ describe WikiPage do
     end
 
     it "returns an array of all commits for the page" do
-      3.times { |i| @page.update("content #{i}") }
+      3.times { |i| @page.update(content: "content #{i}") }
       expect(@page.versions.count).to eq(4)
     end
   end
@@ -294,7 +307,7 @@ describe WikiPage do
     before do
       create_page('Update', 'content')
       @page = wiki.find_page('Update')
-      3.times { |i| @page.update("content #{i}") }
+      3.times { |i| @page.update(content: "content #{i}") }
     end
 
     after do
@@ -338,7 +351,7 @@ describe WikiPage do
     end
 
     it 'returns false for updated wiki page' do
-      updated_wiki_page = original_wiki_page.update("Updated content")
+      updated_wiki_page = original_wiki_page.update(content: "Updated content")
       expect(original_wiki_page).not_to eq(updated_wiki_page)
     end
   end
@@ -360,7 +373,7 @@ describe WikiPage do
     it 'is changed after page updated' do
       last_commit_sha_before_update = @page.last_commit_sha
 
-      @page.update("new content")
+      @page.update(content: "new content")
       @page = wiki.find_page("Update")
 
       expect(@page.last_commit_sha).not_to eq last_commit_sha_before_update
diff --git a/spec/services/wiki_pages/update_service_spec.rb b/spec/services/wiki_pages/update_service_spec.rb
index a242bf5a5cc..2399db7d3d4 100644
--- a/spec/services/wiki_pages/update_service_spec.rb
+++ b/spec/services/wiki_pages/update_service_spec.rb
@@ -9,7 +9,8 @@ describe WikiPages::UpdateService do
     {
       content: 'New content for wiki page',
       format: 'markdown',
-      message: 'New wiki message'
+      message: 'New wiki message',
+      title: 'New Title'
     }
   end
 
@@ -27,6 +28,7 @@ describe WikiPages::UpdateService do
       expect(updated_page.message).to eq(opts[:message])
       expect(updated_page.content).to eq(opts[:content])
       expect(updated_page.format).to eq(opts[:format].to_sym)
+      expect(updated_page.title).to eq(opts[:title])
     end
 
     it 'executes webhooks' do