gitlab 3.7.0 → 4.0.0

data/spec/gitlab/client/merge_requests_spec.rb

@@ -19,12 +19,12 @@ describe Gitlab::Client do
 
   describe ".merge_request" do
     before do
-      stub_get("/projects/3/merge_request/1", "merge_request")
+      stub_get("/projects/3/merge_requests/1", "merge_request")
       @merge_request = Gitlab.merge_request(3, 1)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/3/merge_request/1")).to have_been_made
+      expect(a_get("/projects/3/merge_requests/1")).to have_been_made
     end
 
     it "should return information about a merge request" do
@@ -50,7 +50,7 @@ describe Gitlab::Client do
 
   describe ".update_merge_request" do
     before do
-      stub_put("/projects/3/merge_request/2", "merge_request").
+      stub_put("/projects/3/merge_requests/2", "merge_request").
         with(body: {
                assignee_id: '1',
                target_branch: 'master',
@@ -64,7 +64,7 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      expect(a_put("/projects/3/merge_request/2").
+      expect(a_put("/projects/3/merge_requests/2").
         with(body: {
                assignee_id: '1',
                target_branch: 'master',
@@ -80,13 +80,13 @@ describe Gitlab::Client do
 
   describe ".accept_merge_request" do
     before do
-      stub_put("/projects/5/merge_request/42/merge", "merge_request").
+      stub_put("/projects/5/merge_requests/42/merge", "merge_request").
         with(body: { merge_commit_message: 'Nice!' })
       @merge_request = Gitlab.accept_merge_request(5, 42, merge_commit_message: 'Nice!')
     end
 
     it "should get the correct resource" do
-      expect(a_put("/projects/5/merge_request/42/merge").
+      expect(a_put("/projects/5/merge_requests/42/merge").
         with(body: { merge_commit_message: 'Nice!' })).to have_been_made
     end
 
@@ -134,12 +134,12 @@ describe Gitlab::Client do
 
   describe ".merge_request_changes" do
     before do
-      stub_get("/projects/3/merge_request/2/changes", "merge_request_changes")
+      stub_get("/projects/3/merge_requests/2/changes", "merge_request_changes")
       @mr_changes = Gitlab.merge_request_changes(3, 2)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/3/merge_request/2/changes")).to have_been_made
+      expect(a_get("/projects/3/merge_requests/2/changes")).to have_been_made
     end
 
     it "should return the merge request changes" do
@@ -154,12 +154,12 @@ describe Gitlab::Client do
 
   describe ".merge_request_commits" do
     before do
-      stub_get("/projects/3/merge_request/2/commits", "merge_request_commits")
+      stub_get("/projects/3/merge_requests/2/commits", "merge_request_commits")
       @mr_commits = Gitlab.merge_request_commits(3, 2)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/3/merge_request/2/commits")).to have_been_made
+      expect(a_get("/projects/3/merge_requests/2/commits")).to have_been_made
     end
 
     it "should return the merge request commits" do
@@ -174,4 +174,51 @@ describe Gitlab::Client do
       expect(@mr_commits[1].title).to eq "hoge"
     end
   end
+
+  describe ".merge_request_closes_issues" do
+    before do
+      stub_get("/projects/5/merge_requests/1/closes_issues", "merge_request_closes_issues")
+      @issues = Gitlab.merge_request_closes_issues(5, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/5/merge_requests/1/closes_issues")).to have_been_made
+    end
+
+    it "should return a paginated response of the issues the merge_request will close" do
+      expect(@issues).to be_a(Gitlab::PaginatedResponse)
+      expect(@issues.first.title).to eq("Merge request 1 issue 1")
+      expect(@issues.size).to eq(2)
+    end
+  end
+
+  describe ".subscribe_to_merge_request" do
+    before do
+      stub_post("/projects/3/merge_requests/2/subscribe", "merge_request")
+      @merge_request = Gitlab.subscribe_to_merge_request(3, 2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/merge_requests/2/subscribe")).to have_been_made
+    end
+
+    it "should return information about a merge request" do
+      expect(@merge_request.project_id).to eq(3)
+    end
+  end
+
+  describe ".unsubscribe_from_merge_request" do
+    before do
+      stub_post("/projects/3/merge_requests/2/unsubscribe", "merge_request")
+      @merge_request = Gitlab.unsubscribe_from_merge_request(3, 2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/merge_requests/2/unsubscribe")).to have_been_made
+    end
+
+    it "should return information about a merge request" do
+      expect(@merge_request.project_id).to eq(3)
+    end
+  end
 end

data/spec/gitlab/client/milestones_spec.rb

@@ -48,6 +48,22 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".milestone_merge_requests" do
+    before do
+      stub_get("/projects/3/milestones/1/merge_requests", "milestone_merge_requests")
+      @milestone_merge_requests = Gitlab.milestone_merge_requests(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/milestones/1/merge_requests")).to have_been_made
+    end
+
+    it "should return a paginated response of milestone's merge_requests" do
+      expect(@milestone_merge_requests).to be_a Gitlab::PaginatedResponse
+      expect(@milestone_merge_requests.first.milestone.id).to eq(1)
+    end
+  end
+
   describe ".create_milestone" do
     before do
       stub_post("/projects/3/milestones", "milestone")

data/spec/gitlab/client/pipelines_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".pipelines" do
+    before do
+      stub_get("/projects/3/pipelines", "pipelines")
+      @pipelines = Gitlab.pipelines(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/pipelines")).to have_been_made
+    end
+
+    it "should return a paginated response of project's pipelines" do
+      expect(@pipelines).to be_a Gitlab::PaginatedResponse
+    end
+  end
+  
+  describe ".pipeline" do
+    before do
+      stub_get("/projects/3/pipelines/46", "pipeline")
+      @pipeline = Gitlab.pipeline(3, 46)
+    end
+    
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/pipelines/46")).to have_been_made
+    end
+
+    it "should return a single pipeline" do
+      expect(@pipeline).to be_a Gitlab::ObjectifiedHash
+    end
+    
+    it "should return information about a pipeline" do
+      expect(@pipeline.id).to eq(46)
+      expect(@pipeline.user.name).to eq("Administrator")
+    end
+  end
+
+  describe ".create_pipeline" do
+    before do
+      stub_post("/projects/3/pipeline?ref=master", "pipeline_create")
+      @pipeline_create = Gitlab.create_pipeline(3, 'master')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/pipeline?ref=master")).to have_been_made
+    end
+
+    it "should return a single pipeline" do
+      expect(@pipeline_create).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "should return information about a pipeline" do
+      expect(@pipeline_create.user.name).to eq("Administrator")
+    end
+  end
+
+  describe ".cancel_pipeline" do
+    before do
+      stub_post("/projects/3/pipelines/46/cancel", "pipeline_cancel")
+      @pipeline_cancel = Gitlab.cancel_pipeline(3, 46)
+    end
+    
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/pipelines/46/cancel")).to have_been_made
+    end
+
+    it "should return a single pipeline" do
+      expect(@pipeline_cancel).to be_a Gitlab::ObjectifiedHash
+    end
+    
+    it "should return information about a pipeline" do
+      expect(@pipeline_cancel.user.name).to eq("Administrator")
+    end
+  end
+  
+  describe ".retry_pipeline" do
+    before do
+      stub_post("/projects/3/pipelines/46/retry", "pipeline_retry")
+      @pipeline_retry = Gitlab.retry_pipeline(3, 46)
+    end
+    
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/pipelines/46/retry")).to have_been_made
+    end
+
+    it "should return a single pipeline" do
+      expect(@pipeline_retry).to be_a Gitlab::ObjectifiedHash
+    end
+    
+    it "should return information about a pipeline" do
+      expect(@pipeline_retry.user.name).to eq("Administrator")
+    end
+  end
+end

data/spec/gitlab/client/projects_spec.rb

@@ -122,12 +122,12 @@ describe Gitlab::Client do
   describe ".create_fork" do
     context "without sudo option" do
       before do
-        stub_post("/projects/fork/3", "project_fork")
+        stub_post("/projects/3/fork", "project_fork")
         @project = Gitlab.create_fork(3)
       end
 
       it "should post to the correct resource" do
-        expect(a_post("/projects/fork/3")).to have_been_made
+        expect(a_post("/projects/3/fork")).to have_been_made
       end
 
       it "should return information about the forked project" do
@@ -138,13 +138,13 @@ describe Gitlab::Client do
 
     context "with the sudo option" do
       before do
-        stub_post("/projects/fork/3", "project_forked_for_user")
+        stub_post("/projects/3/fork", "project_forked_for_user")
         @sudoed_username = 'jack.smith'
         @project = Gitlab.create_fork(3, sudo: @sudoed_username)
       end
 
       it "should post to the correct resource" do
-        expect(a_post("/projects/fork/3")).to have_been_made
+        expect(a_post("/projects/3/fork")).to have_been_made
       end
 
       it "should return information about the forked project" do
@@ -363,81 +363,81 @@ describe Gitlab::Client do
     end
   end
 
-  describe ".git_hook" do
+  describe ".push_rule" do
     before do
-      stub_get("/projects/1/git_hook", "git_hook")
-      @git_hook = Gitlab.git_hook(1)
+      stub_get("/projects/1/push_rule", "push_rule")
+      @push_rule = Gitlab.push_rule(1)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/1/git_hook")).to have_been_made
+      expect(a_get("/projects/1/push_rule")).to have_been_made
     end
 
-    it "should return information about a git hook" do
-      expect(@git_hook.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
+    it "should return information about a push rule" do
+      expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
     end
   end
 
-  describe ".add_git_hook" do
+  describe ".add_push_rule" do
     before do
-      stub_post("/projects/1/git_hook", "git_hook")
-      @git_hook = Gitlab.add_git_hook(1, { deny_delete_tag: false, commit_message_regex: "\\b[A-Z]{3}-[0-9]+\\b" })
+      stub_post("/projects/1/push_rule", "push_rule")
+      @push_rule = Gitlab.add_push_rule(1, { deny_delete_tag: false, commit_message_regex: "\\b[A-Z]{3}-[0-9]+\\b" })
     end
 
     it "should get the correct resource" do
-      expect(a_post("/projects/1/git_hook")).to have_been_made
+      expect(a_post("/projects/1/push_rule")).to have_been_made
     end
 
-    it "should return information about an added git hook" do
-      expect(@git_hook.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
+    it "should return information about an added push rule" do
+      expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
     end
   end
 
-  describe ".edit_git_hook" do
+  describe ".edit_push_rule" do
     before do
-      stub_put("/projects/1/git_hook", "git_hook")
-      @git_hook = Gitlab.edit_git_hook(1, { deny_delete_tag: false, commit_message_regex: "\\b[A-Z]{3}-[0-9]+\\b" })
+      stub_put("/projects/1/push_rule", "push_rule")
+      @push_rule = Gitlab.edit_push_rule(1, { deny_delete_tag: false, commit_message_regex: "\\b[A-Z]{3}-[0-9]+\\b" })
     end
 
     it "should get the correct resource" do
-      expect(a_put("/projects/1/git_hook")).to have_been_made
+      expect(a_put("/projects/1/push_rule")).to have_been_made
     end
 
-    it "should return information about an edited git hook" do
-      expect(@git_hook.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
+    it "should return information about an edited push rule" do
+      expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
     end
   end
 
-  describe ".delete_git_hook" do
+  describe ".delete_push_rule" do
     context "when empty response" do
       before do
-        stub_request(:delete, "#{Gitlab.endpoint}/projects/1/git_hook").
+        stub_request(:delete, "#{Gitlab.endpoint}/projects/1/push_rule").
           with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token }).
           to_return(body: '')
-        @git_hook = Gitlab.delete_git_hook(1)
+        @push_rule = Gitlab.delete_push_rule(1)
       end
 
       it "should get the correct resource" do
-        expect(a_delete("/projects/1/git_hook")).to have_been_made
+        expect(a_delete("/projects/1/push_rule")).to have_been_made
       end
 
       it "should return false" do
-        expect(@git_hook).to be(false)
+        expect(@push_rule).to be(false)
       end
     end
 
     context "when JSON response" do
       before do
-        stub_delete("/projects/1/git_hook", "git_hook")
-        @git_hook = Gitlab.delete_git_hook(1)
+        stub_delete("/projects/1/push_rule", "push_rule")
+        @push_rule = Gitlab.delete_push_rule(1)
       end
 
       it "should get the correct resource" do
-        expect(a_delete("/projects/1/git_hook")).to have_been_made
+        expect(a_delete("/projects/1/push_rule")).to have_been_made
       end
 
-      it "should return information about a deleted git hook" do
-        expect(@git_hook.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
+      it "should return information about a deleted push rule" do
+        expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
       end
     end
   end
@@ -475,12 +475,12 @@ describe Gitlab::Client do
 
   describe ".deploy_keys" do
     before do
-      stub_get("/projects/42/keys", "project_keys")
+      stub_get("/projects/42/deploy_keys", "project_keys")
       @deploy_keys = Gitlab.deploy_keys(42)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/42/keys")).to have_been_made
+      expect(a_get("/projects/42/deploy_keys")).to have_been_made
     end
 
     it "should return project deploy keys" do
@@ -493,12 +493,12 @@ describe Gitlab::Client do
 
   describe ".deploy_key" do
     before do
-      stub_get("/projects/42/keys/2", "project_key")
+      stub_get("/projects/42/deploy_keys/2", "project_key")
       @deploy_key = Gitlab.deploy_key(42, 2)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/42/keys/2")).to have_been_made
+      expect(a_get("/projects/42/deploy_keys/2")).to have_been_made
     end
 
     it "should return project deploy key" do
@@ -510,16 +510,94 @@ describe Gitlab::Client do
 
   describe ".delete_deploy_key" do
     before do
-      stub_delete("/projects/42/keys/2", "project_key")
+      stub_delete("/projects/42/deploy_keys/2", "project_key")
       @deploy_key = Gitlab.delete_deploy_key(42, 2)
     end
 
     it "should get the correct resource" do
-      expect(a_delete("/projects/42/keys/2")).to have_been_made
+      expect(a_delete("/projects/42/deploy_keys/2")).to have_been_made
     end
 
     it "should return information about a deleted key" do
       expect(@deploy_key.id).to eq(2)
     end
   end
+
+  describe ".enable_deploy_key" do
+    before do
+      stub_post("/projects/42/deploy_keys/2/enable", "project_key")
+      @deploy_key = Gitlab.enable_deploy_key(42, 2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/42/deploy_keys/2/enable").
+          with(body: { id: '42', key_id: '2' })).to have_been_made
+    end
+
+    it "should return information about an enabled key" do
+      expect(@deploy_key.id).to eq(2)
+    end
+  end
+
+  describe ".disable_deploy_key" do
+    before do
+      stub_post("/projects/42/deploy_keys/2/disable", "project_key")
+      @deploy_key = Gitlab.disable_deploy_key(42, 2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/42/deploy_keys/2/disable").
+          with(body: { id: '42', key_id: '2' })).to have_been_made
+    end
+
+    it "should return information about a disabled key" do
+      expect(@deploy_key.id).to eq(2)
+    end
+  end
+
+  describe ".share_project_with_group" do
+    before do
+      stub_post("/projects/3/share", "group")
+      @group = Gitlab.share_project_with_group(3, 10, 40)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/share").
+          with(body: { group_id: '10', group_access: '40' })).to have_been_made
+    end
+
+    it "should return information about an added group" do
+      expect(@group.id).to eq(10)
+    end
+  end
+
+  describe ".star_project" do
+    before do
+      stub_post("/projects/3/star", "project_star")
+      @starred_project = Gitlab.star_project(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/star")).to have_been_made
+    end
+
+    it "should return information about the starred project" do
+      expect(@starred_project.id).to eq(3)
+    end
+  end
+
+  describe ".unstar_project" do
+    before do
+      stub_delete("/projects/3/star", "project_unstar")
+      @unstarred_project = Gitlab.unstar_project(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/3/star")).to have_been_made
+    end
+
+    it "should return information about the unstarred project" do
+      expect(@unstarred_project.id).to eq(3)
+    end
+  end
 end