1 files changed, 31 insertions, 21 deletions
diff --git a/spec/requests/api/project_hooks_spec.rb b/spec/requests/api/project_hooks_spec.rb
index fd1fffa6223..765dc8a8f66 100644
--- a/spec/requests/api/project_hooks_spec.rb
+++ b/spec/requests/api/project_hooks_spec.rb
@@ -7,9 +7,9 @@ describe API::API, 'ProjectHooks', api: true do
   let!(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
   let!(:hook) do
     create(:project_hook,
-           project: project, url: "http://example.com",
-           push_events: true, merge_requests_events: true, tag_push_events: true,
-           issues_events: true, note_events: true, build_events: true,
+           :all_events_enabled,
+           project: project,
+           url: 'http://example.com',
            enable_ssl_verification: true)
   end
 
@@ -20,7 +20,7 @@ describe API::API, 'ProjectHooks', api: true do
 
   describe "GET /projects/:id/hooks" do
     context "authorized user" do
-      it "should return project hooks" do
+      it "returns project hooks" do
         get api("/projects/#{project.id}/hooks", user)
         expect(response).to have_http_status(200)
 
@@ -33,12 +33,14 @@ describe API::API, 'ProjectHooks', api: true do
         expect(json_response.first['tag_push_events']).to eq(true)
         expect(json_response.first['note_events']).to eq(true)
         expect(json_response.first['build_events']).to eq(true)
+        expect(json_response.first['pipeline_events']).to eq(true)
+        expect(json_response.first['wiki_page_events']).to eq(true)
         expect(json_response.first['enable_ssl_verification']).to eq(true)
       end
     end
 
     context "unauthorized user" do
-      it "should not access project hooks" do
+      it "does not access project hooks" do
         get api("/projects/#{project.id}/hooks", user3)
         expect(response).to have_http_status(403)
       end
@@ -47,7 +49,7 @@ describe API::API, 'ProjectHooks', api: true do
 
   describe "GET /projects/:id/hooks/:hook_id" do
     context "authorized user" do
-      it "should return a project hook" do
+      it "returns a project hook" do
         get api("/projects/#{project.id}/hooks/#{hook.id}", user)
         expect(response).to have_http_status(200)
         expect(json_response['url']).to eq(hook.url)
@@ -56,30 +58,33 @@ describe API::API, 'ProjectHooks', api: true do
         expect(json_response['merge_requests_events']).to eq(hook.merge_requests_events)
         expect(json_response['tag_push_events']).to eq(hook.tag_push_events)
         expect(json_response['note_events']).to eq(hook.note_events)
+        expect(json_response['build_events']).to eq(hook.build_events)
+        expect(json_response['pipeline_events']).to eq(hook.pipeline_events)
+        expect(json_response['wiki_page_events']).to eq(hook.wiki_page_events)
         expect(json_response['enable_ssl_verification']).to eq(hook.enable_ssl_verification)
       end
 
-      it "should return a 404 error if hook id is not available" do
+      it "returns a 404 error if hook id is not available" do
         get api("/projects/#{project.id}/hooks/1234", user)
         expect(response).to have_http_status(404)
       end
     end
 
     context "unauthorized user" do
-      it "should not access an existing hook" do
+      it "does not access an existing hook" do
         get api("/projects/#{project.id}/hooks/#{hook.id}", user3)
         expect(response).to have_http_status(403)
       end
     end
 
-    it "should return a 404 error if hook id is not available" do
+    it "returns a 404 error if hook id is not available" do
       get api("/projects/#{project.id}/hooks/1234", user)
       expect(response).to have_http_status(404)
     end
   end
 
   describe "POST /projects/:id/hooks" do
-    it "should add hook to project" do
+    it "adds hook to project" do
       expect do
         post api("/projects/#{project.id}/hooks", user), url: "http://example.com", issues_events: true
       end.to change {project.hooks.count}.by(1)
@@ -91,22 +96,24 @@ describe API::API, 'ProjectHooks', api: true do
       expect(json_response['tag_push_events']).to eq(false)
       expect(json_response['note_events']).to eq(false)
       expect(json_response['build_events']).to eq(false)
+      expect(json_response['pipeline_events']).to eq(false)
+      expect(json_response['wiki_page_events']).to eq(false)
       expect(json_response['enable_ssl_verification']).to eq(true)
     end
 
-    it "should return a 400 error if url not given" do
+    it "returns a 400 error if url not given" do
       post api("/projects/#{project.id}/hooks", user)
       expect(response).to have_http_status(400)
     end
 
-    it "should return a 422 error if url not valid" do
+    it "returns a 422 error if url not valid" do
       post api("/projects/#{project.id}/hooks", user), "url" => "ftp://example.com"
       expect(response).to have_http_status(422)
     end
   end
 
   describe "PUT /projects/:id/hooks/:hook_id" do
-    it "should update an existing project hook" do
+    it "updates an existing project hook" do
       put api("/projects/#{project.id}/hooks/#{hook.id}", user),
         url: 'http://example.org', push_events: false
       expect(response).to have_http_status(200)
@@ -116,49 +123,52 @@ describe API::API, 'ProjectHooks', api: true do
       expect(json_response['merge_requests_events']).to eq(hook.merge_requests_events)
       expect(json_response['tag_push_events']).to eq(hook.tag_push_events)
       expect(json_response['note_events']).to eq(hook.note_events)
+      expect(json_response['build_events']).to eq(hook.build_events)
+      expect(json_response['pipeline_events']).to eq(hook.pipeline_events)
+      expect(json_response['wiki_page_events']).to eq(hook.wiki_page_events)
       expect(json_response['enable_ssl_verification']).to eq(hook.enable_ssl_verification)
     end
 
-    it "should return 404 error if hook id not found" do
+    it "returns 404 error if hook id not found" do
       put api("/projects/#{project.id}/hooks/1234", user), url: 'http://example.org'
       expect(response).to have_http_status(404)
     end
 
-    it "should return 400 error if url is not given" do
+    it "returns 400 error if url is not given" do
       put api("/projects/#{project.id}/hooks/#{hook.id}", user)
       expect(response).to have_http_status(400)
     end
 
-    it "should return a 422 error if url is not valid" do
+    it "returns a 422 error if url is not valid" do
       put api("/projects/#{project.id}/hooks/#{hook.id}", user), url: 'ftp://example.com'
       expect(response).to have_http_status(422)
     end
   end
 
   describe "DELETE /projects/:id/hooks/:hook_id" do
-    it "should delete hook from project" do
+    it "deletes hook from project" do
       expect do
         delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
       end.to change {project.hooks.count}.by(-1)
       expect(response).to have_http_status(200)
     end
 
-    it "should return success when deleting hook" do
+    it "returns success when deleting hook" do
       delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
       expect(response).to have_http_status(200)
     end
 
-    it "should return a 404 error when deleting non existent hook" do
+    it "returns a 404 error when deleting non existent hook" do
       delete api("/projects/#{project.id}/hooks/42", user)
       expect(response).to have_http_status(404)
     end
 
-    it "should return a 405 error if hook id not given" do
+    it "returns a 405 error if hook id not given" do
       delete api("/projects/#{project.id}/hooks", user)
       expect(response).to have_http_status(405)
     end
 
-    it "shold return a 404 if a user attempts to delete project hooks he/she does not own" do
+    it "returns a 404 if a user attempts to delete project hooks he/she does not own" do
       test_user = create(:user)
       other_project = create(:project)
       other_project.team << [test_user, :master]