Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into 'master'

Resolve "Wiki page delete does not trigger the webhook"

Closes #19302

See merge request !8198

10 files changed, 146 insertions, 2 deletions

diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 0faa71c4d7d..2d8064c9878 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -84,7 +84,7 @@ class Projects::WikisController < Projects::ApplicationController
 
   def destroy
     @page = @project_wiki.find_page(params[:id])
-    @page&.delete
+    WikiPages::DestroyService.new(@project, current_user).execute(@page)
 
     redirect_to(
       namespace_project_wiki_path(@project.namespace, @project, :home),
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 6347b274341..2caebb496db 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -207,6 +207,10 @@ class WikiPage
     'projects/wikis/wiki_page'
   end
 
+  def id
+    page.version.to_s
+  end
+
   private
 
   def set_attributes
diff --git a/app/services/wiki_pages/destroy_service.rb b/app/services/wiki_pages/destroy_service.rb
new file mode 100644
index 00000000000..6b93fb2f6d7
--- /dev/null
+++ b/app/services/wiki_pages/destroy_service.rb
@@ -0,0 +1,11 @@
+module WikiPages
+  class DestroyService < WikiPages::BaseService
+    def execute(page)
+      if page&.delete
+        execute_hooks(page, 'delete')
+      end
+
+      page
+    end
+  end
+end
diff --git a/changelogs/unreleased/19302-wiki-page-delete-does-not-trigger-the-webhook.yml b/changelogs/unreleased/19302-wiki-page-delete-does-not-trigger-the-webhook.yml
new file mode 100644
index 00000000000..d74057dca8a
--- /dev/null
+++ b/changelogs/unreleased/19302-wiki-page-delete-does-not-trigger-the-webhook.yml
@@ -0,0 +1,4 @@
+---
+title: Execute web hooks for WikiPage delete operation
+merge_request: 8198
+author:
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index 9df0c765f84..55d480bfb72 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -714,7 +714,7 @@ X-Gitlab-Event: Merge Request Hook
 
 ### Wiki Page events
 
-Triggered when a wiki page is created or edited.
+Triggered when a wiki page is created, edited or deleted.
 
 **Request Header**:
 
diff --git a/spec/factories/wiki_pages.rb b/spec/factories/wiki_pages.rb
index efa6cbe5bb1..4105f59e289 100644
--- a/spec/factories/wiki_pages.rb
+++ b/spec/factories/wiki_pages.rb
@@ -2,8 +2,26 @@ require 'ostruct'
 
 FactoryGirl.define do
   factory :wiki_page do
+    transient do
+      attrs do
+        {
+          title: 'Title',
+          content: 'Content for wiki page',
+          format: 'markdown'
+        }
+      end
+    end
+
     page { OpenStruct.new(url_path: 'some-name') }
     association :wiki, factory: :project_wiki, strategy: :build
     initialize_with { new(wiki, page, true) }
+
+    before(:create) do |page, evaluator|
+      page.attributes = evaluator.attrs
+    end
+
+    to_create do |page|
+      page.create
+    end
   end
 end
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index 579ebac7afb..753dc938c52 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -318,6 +318,19 @@ describe WikiPage, models: true do
     end
   end
 
+  describe '#==' do
+    let(:original_wiki_page) { create(:wiki_page) }
+
+    it 'returns true for identical wiki page' do
+      expect(original_wiki_page).to eq(original_wiki_page)
+    end
+
+    it 'returns false for updated wiki page' do
+      updated_wiki_page = original_wiki_page.update("Updated content")
+      expect(original_wiki_page).not_to eq(updated_wiki_page)
+    end
+  end
+
   private
 
   def remove_temp_repo(path)
diff --git a/spec/services/wiki_pages/create_service_spec.rb b/spec/services/wiki_pages/create_service_spec.rb
new file mode 100644
index 00000000000..5341ba3d261
--- /dev/null
+++ b/spec/services/wiki_pages/create_service_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe WikiPages::CreateService, services: true do
+  let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+  let(:opts) do
+    {
+      title: 'Title',
+      content: 'Content for wiki page',
+      format: 'markdown'
+    }
+  end
+  let(:service) { described_class.new(project, user, opts) }
+
+  describe '#execute' do
+    context "valid params" do
+      before do
+        allow(service).to receive(:execute_hooks)
+        project.add_master(user)
+      end
+
+      subject { service.execute }
+
+      it 'creates a valid wiki page' do
+        is_expected.to be_valid
+        expect(subject.title).to eq(opts[:title])
+        expect(subject.content).to eq(opts[:content])
+        expect(subject.format).to eq(opts[:format].to_sym)
+      end
+
+      it 'executes webhooks' do
+        expect(service).to have_received(:execute_hooks).once.with(subject, 'create')
+      end
+    end
+  end
+end
diff --git a/spec/services/wiki_pages/destroy_service_spec.rb b/spec/services/wiki_pages/destroy_service_spec.rb
new file mode 100644
index 00000000000..a4b9a390fe2
--- /dev/null
+++ b/spec/services/wiki_pages/destroy_service_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe WikiPages::DestroyService, services: true do
+  let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+  let(:wiki_page) { create(:wiki_page) }
+  let(:service) { described_class.new(project, user) }
+
+  describe '#execute' do
+    before do
+      allow(service).to receive(:execute_hooks)
+      project.add_master(user)
+    end
+
+    it 'executes webhooks' do
+      service.execute(wiki_page)
+
+      expect(service).to have_received(:execute_hooks).once.with(wiki_page, 'delete')
+    end
+  end
+end
diff --git a/spec/services/wiki_pages/update_service_spec.rb b/spec/services/wiki_pages/update_service_spec.rb
new file mode 100644
index 00000000000..2bccca764d7
--- /dev/null
+++ b/spec/services/wiki_pages/update_service_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe WikiPages::UpdateService, services: true do
+  let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+  let(:wiki_page) { create(:wiki_page) }
+  let(:opts) do
+    {
+      content: 'New content for wiki page',
+      format: 'markdown',
+      message: 'New wiki message'
+    }
+  end
+  let(:service) { described_class.new(project, user, opts) }
+
+  describe '#execute' do
+    context "valid params" do
+      before do
+        allow(service).to receive(:execute_hooks)
+        project.add_master(user)
+      end
+
+      subject { service.execute(wiki_page) }
+
+      it 'updates the wiki page' do
+        is_expected.to be_valid
+        expect(subject.content).to eq(opts[:content])
+        expect(subject.format).to eq(opts[:format].to_sym)
+        expect(subject.message).to eq(opts[:message])
+      end
+
+      it 'executes webhooks' do
+        expect(service).to have_received(:execute_hooks).once.with(subject, 'update')
+      end
+    end
+  end
+end