diff --git a/app/controllers/admin/web_hooks_controller.rb b/app/controllers/admin/web_hooks_controller.rb
index af984f6477d..4deb554c8b7 100644
--- a/app/controllers/admin/web_hooks_controller.rb
+++ b/app/controllers/admin/web_hooks_controller.rb
@@ -100,7 +100,7 @@ class Admin::WebHooksController < Admin::AdminController
   end
 
   def ping
-    Jobs.enqueue(:emit_web_hook_event, web_hook_id: @web_hook.id, event_type: 'ping')
+    Jobs.enqueue(:emit_web_hook_event, web_hook_id: @web_hook.id, event_type: 'ping', event_name: 'ping')
     render json: success_json
   end
 
diff --git a/spec/controllers/admin/web_hooks_controller_spec.rb b/spec/controllers/admin/web_hooks_controller_spec.rb
new file mode 100644
index 00000000000..bf6b894c441
--- /dev/null
+++ b/spec/controllers/admin/web_hooks_controller_spec.rb
@@ -0,0 +1,62 @@
+require "rails_helper"
+
+describe Admin::WebHooksController do
+
+  it 'is a subclass of AdminController' do
+    expect(Admin::WebHooksController < Admin::AdminController).to eq(true)
+  end
+
+  context 'while logged in as an admin' do
+    before do
+      @user = log_in(:admin)
+    end
+    let(:web_hook) { Fabricate(:web_hook) }
+
+    describe '#create' do
+      it 'creates a webhook' do
+        xhr :post, :create, web_hook: {
+          payload_url: 'https://meta.discourse.org/',
+          content_type: 1,
+          secret: "a_secret_for_webhooks",
+          wildcard_web_hook: false,
+          active: true,
+          verify_certificate: true,
+          web_hook_event_type_ids: [1],
+          group_ids: [],
+          category_ids: []
+        }
+        expect(response).to be_success
+
+        json = ::JSON.parse(response.body)
+        expect(json["web_hook"]["payload_url"]).to be_present
+      end
+
+      it 'returns error when field is not filled correctly' do
+        xhr :post, :create, web_hook: {
+          content_type: 1,
+          secret: "a_secret_for_webhooks",
+          wildcard_web_hook: false,
+          active: true,
+          verify_certificate: true,
+          web_hook_event_type_ids: [1],
+          group_ids: [],
+          category_ids: []
+        }
+        expect(response.status).to eq 422
+        response_body = JSON.parse(response.body)
+
+        expect(response_body["errors"]).to be_present
+      end
+    end
+
+    describe '#ping' do
+      it 'enqueues the ping event' do
+        Jobs.expects(:enqueue)
+            .with(:emit_web_hook_event, web_hook_id: web_hook.id, event_type: 'ping', event_name: 'ping')
+        xhr :post, :ping, id: web_hook.id
+
+        expect(response).to be_success
+      end
+    end
+  end
+end