Merge branch 'master' into fixes/api

Conflicts:
	spec/requests/api/projects_spec.rb

1 files changed, 17 insertions, 0 deletions

diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 431aae7cc11..8de06c33394 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -66,6 +66,23 @@ describe Gitlab::API do
     end
   end
 
+  describe "PUT /projects/:id/merge_request/:merge_request_id to close MR" do
+    it "should return merge_request" do
+      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "close"
+      response.status.should == 200
+      json_response['state'].should == 'closed'
+    end
+  end
+
+  describe "PUT /projects/:id/merge_request/:merge_request_id to merge MR" do
+    it "should return merge_request" do
+      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "merge"
+      response.status.should == 200
+      json_response['state'].should == 'merged'
+    end
+  end
+
+
   describe "PUT /projects/:id/merge_request/:merge_request_id" do
     it "should return merge_request" do
       put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"