Fix ProjectPushRules API

Signed-off-by: Rémy Coutable <remy@rymai.me>

lib/api/api.rb

@@ -22,6 +22,7 @@ module API
       mount ::API::V3::Notes
       mount ::API::V3::ProjectGitHook
       mount ::API::V3::ProjectHooks
+      mount ::API::V3::ProjectPushRule
       mount ::API::V3::Projects
       mount ::API::V3::ProjectSnippets
       mount ::API::V3::Repositories

lib/api/v3/project_push_rule.rb

+module API
+  module V3
+    class ProjectPushRule < Grape::API
+      before { authenticate! }
+      before { authorize_admin_project }
+
+      params do
+        requires :id, type: String, desc: 'The ID of a project'
+      end
+      resource :projects do
+        desc 'Deletes project push rule'
+        delete ":id/push_rule" do
+          push_rule = user_project.push_rule
+          not_found!('Push Rule') unless push_rule
+
+          status(200)
+          push_rule.destroy
+        end
+      end
+    end
+  end
+end

spec/requests/api/project_push_rule_spec.rb

@@ -131,8 +131,7 @@ describe API::ProjectPushRule, 'ProjectPushRule', api: true  do
       it "deletes push rule from project" do
         delete api("/projects/#{project.id}/push_rule", user)
 
-        expect(response).to have_http_status(200)
-        expect(json_response).to be_an Hash
+        expect(response).to have_http_status(204)
       end
     end
 

spec/requests/api/v3/project_push_rule_spec.rb

+require 'spec_helper'
+
+describe API::V3::ProjectPushRule, 'ProjectPushRule', api: true  do
+  include ApiHelpers
+  let(:user) { create(:user) }
+  let(:user3) { create(:user) }
+  let!(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
+
+  before do
+    project.team << [user, :master]
+    project.team << [user3, :developer]
+  end
+
+  describe "DELETE /projects/:id/push_rule" do
+    before do
+      create(:push_rule, project: project)
+    end
+
+    context "authorized user" do
+      it "deletes push rule from project" do
+        delete v3_api("/projects/#{project.id}/push_rule", user)
+
+        expect(response).to have_http_status(200)
+        expect(json_response).to be_an Hash
+      end
+    end
+
+    context "unauthorized user" do
+      it "returns a 403 error" do
+        delete v3_api("/projects/#{project.id}/push_rule", user3)
+
+        expect(response).to have_http_status(403)
+      end
+    end
+  end
+
+  describe "DELETE /projects/:id/push_rule" do
+    context "for non existing push rule" do
+      it "deletes push rule from project" do
+        delete v3_api("/projects/#{project.id}/push_rule", user)
+
+        expect(response).to have_http_status(404)
+        expect(json_response).to be_an Hash
+        expect(json_response['message']).to eq('404 Push Rule Not Found')
+      end
+
+      it "returns a 403 error if not authorized" do
+        delete v3_api("/projects/#{project.id}/push_rule", user3)
+
+        expect(response).to have_http_status(403)
+      end
+    end
+  end
+end