gitlab 4.3.0 → 4.4.0

data/spec/gitlab/client/branches_spec.rb

@@ -86,12 +86,14 @@ describe Gitlab::Client do
 
   describe ".create_branch" do
     before do
-      stub_post("/projects/3/repository/branches", "branch")
+      stub_post("/projects/3/repository/branches", "branch").with(query: { branch: 'api', ref: "master"})
       @branch = Gitlab.create_branch(3, "api", "master")
     end
 
     it "gets the correct resource" do
-      expect(a_post("/projects/3/repository/branches")).to have_been_made
+      expect(
+        a_post("/projects/3/repository/branches").with(query: { branch: 'api', ref: "master"})
+      ).to have_been_made
     end
 
     it "returns information about a new repository branch" do

data/spec/gitlab/client/commits_spec.rb

@@ -8,6 +8,7 @@ describe Gitlab::Client do
   it { is_expected.to respond_to :repo_create_commit_comment }
   it { is_expected.to respond_to :repo_commit_status }
   it { is_expected.to respond_to :repo_update_commit_status }
+  it { is_expected.to respond_to :repo_commit_merge_requests }
 
   describe ".commits" do
     before do
@@ -165,4 +166,25 @@ describe Gitlab::Client do
       expect(@commit.id).to eq('ed899a2f4b50b4370feeea94676502b42383c746')
     end
   end
+
+  describe ".repo_commit_merge_requests" do
+    before do
+      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/merge_requests", "project_commit_merge_requests")
+      @commit_merge_requests = Gitlab.commit_merge_requests(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/merge_requests")).
+        to have_been_made
+    end
+
+    it "returns commit's associated merge_requests" do
+      expect(@commit_merge_requests).to be_a Gitlab::PaginatedResponse
+      expect(@commit_merge_requests.length).to eq(2)
+      expect(@commit_merge_requests[0].iid).to eq(1)
+      expect(@commit_merge_requests[0].author.id).to eq(1)
+      expect(@commit_merge_requests[1].iid).to eq(2)
+      expect(@commit_merge_requests[1].author.id).to eq(2)
+    end
+  end
 end

data/spec/gitlab/client/events_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".events" do
+    before do
+      stub_get("/events", "user_events")
+      @events = Gitlab.events()
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/events")).to have_been_made
+    end
+
+    it "it returns a response of user's events" do
+      expect(@events).to be_a Gitlab::PaginatedResponse
+    end
+  end
+
+  describe ".user_events" do
+    before do
+      stub_get("/users/1/events", "user_events")
+      @events = Gitlab.user_events(1)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/users/1/events")).to have_been_made
+    end
+
+    it "returns a response of user's contribution events" do
+      expect(@events).to be_a Gitlab::PaginatedResponse
+    end
+  end
+
+  describe '.project_events' do
+    before do
+      stub_get("/1/events", "project_events")
+      @events = Gitlab.project_events(1)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/1/events")).to have_been_made
+    end
+
+    it "returns a response of project's visible events" do
+      expect(@events).to be_a Gitlab::PaginatedResponse
+    end
+  end
+end

data/spec/gitlab/client/group_milestones_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".group_milestones" do
+    before do
+      stub_get("/groups/3/milestones", "group_milestones")
+      @milestones = Gitlab.group_milestones(3)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/groups/3/milestones")).to have_been_made
+    end
+
+    it "returns a paginated response of group's milestones" do
+      expect(@milestones).to be_a Gitlab::PaginatedResponse
+      expect(@milestones.first.group_id).to eq(3)
+    end
+  end
+
+  describe ".group_milestone" do
+    before do
+      stub_get("/groups/3/milestones/1", "group_milestone")
+      @milestone = Gitlab.group_milestone(3, 1)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/groups/3/milestones/1")).to have_been_made
+    end
+
+    it "returns information about a milestone" do
+      expect(@milestone.group_id).to eq(3)
+    end
+  end
+
+  describe ".create_group_milestone" do
+    before do
+      stub_post("/groups/3/milestones", "group_milestone")
+      @milestone = Gitlab.create_group_milestone(3, 'title')
+    end
+
+    it "gets the correct resource" do
+      expect(a_post("/groups/3/milestones").
+        with(body: { title: 'title' })).to have_been_made
+    end
+
+    it "returns information about a created milestone" do
+      expect(@milestone.group_id).to eq(3)
+    end
+  end
+
+  describe ".edit_group_milestone" do
+    before do
+      stub_put("/groups/3/milestones/33", "group_milestone")
+      @milestone = Gitlab.edit_group_milestone(3, 33, title: 'title')
+    end
+
+    it "gets the correct resource" do
+      expect(a_put("/groups/3/milestones/33").
+        with(body: { title: 'title' })).to have_been_made
+    end
+
+    it "returns information about an edited milestone" do
+      expect(@milestone.group_id).to eq(3)
+    end
+  end
+
+  describe ".group_milestone_issues" do
+    before do
+      stub_get("/groups/3/milestones/1/issues", "group_milestone_issues")
+      @milestone_issues = Gitlab.group_milestone_issues(3, 1)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/groups/3/milestones/1/issues")).to have_been_made
+    end
+
+    it "returns a paginated response of milestone's issues" do
+      expect(@milestone_issues).to be_a Gitlab::PaginatedResponse
+      expect(@milestone_issues.first.milestone.id).to eq(1)
+    end
+  end
+
+  describe ".group_milestone_merge_requests" do
+    before do
+      stub_get("/groups/3/milestones/1/merge_requests", "group_milestone_merge_requests")
+      @milestone_merge_requests = Gitlab.group_milestone_merge_requests(3, 1)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/groups/3/milestones/1/merge_requests")).to have_been_made
+    end
+
+    it "returns 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
+end

data/spec/gitlab/client/merge_requests_spec.rb

@@ -1,6 +1,21 @@
 require 'spec_helper'
 
 describe Gitlab::Client do
+  describe ".user_merge_requests" do
+    before do
+      stub_get("/merge_requests", "merge_requests")
+      @user_merge_requests = Gitlab.user_merge_requests
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/merge_requests")).to have_been_made
+    end
+
+    it "returns a paginated response of user merge requests" do
+      expect(@user_merge_requests).to be_a Gitlab::PaginatedResponse
+    end
+  end
+
   describe ".merge_requests" do
     before do
       stub_get("/projects/3/merge_requests", "merge_requests")
@@ -221,4 +236,116 @@ describe Gitlab::Client do
       expect(@merge_request.project_id).to eq(3)
     end
   end
+
+  describe ".merge_request_discussions" do
+    before do
+      stub_get("/projects/3/merge_requests/2/discussions", "merge_request_discussions")
+      @discussions = Gitlab.merge_request_discussions(3, 2)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/merge_requests/2/discussions")).to have_been_made
+    end
+
+    it "returns information about the discussions" do
+      expect(@discussions.length).to eq(1)
+      expect(@discussions.first.id).to eq('7d66bf19bf835e6a4666130544ba1b5c343fc705')
+    end
+  end
+
+  describe ".merge_request_discussion" do
+    before do
+      stub_get("/projects/3/merge_requests/2/discussions/1", "merge_request_discussion")
+      @discussion = Gitlab.merge_request_discussion(3, 2, 1)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/merge_requests/2/discussions/1")).to have_been_made
+    end
+
+    it "returns information about the discussions" do
+      expect(@discussion.id).to eq('7d66bf19bf835e6a4666130544ba1b5c343fc705')
+    end
+  end
+
+  describe ".create_merge_request_discussion" do
+    before do
+      stub_post("/projects/3/merge_requests/2/discussions", "merge_request_discussion")
+      @discussion = Gitlab.create_merge_request_discussion(3, 2, body: 'Discussion', position: {old_line: 1})
+    end
+
+    it "posts the correct resource" do
+      expect(a_post("/projects/3/merge_requests/2/discussions").
+        with(body: 'body=Discussion&position[old_line]=1')).to have_been_made
+    end
+
+    it "returns information about the discussions" do
+      expect(@discussion.id).to eq('7d66bf19bf835e6a4666130544ba1b5c343fc705')
+    end
+  end
+
+  describe ".resolve_merge_request_discussion" do
+    before do
+      stub_put("/projects/3/merge_requests/2/discussions/1", "merge_request_discussion")
+      @discussion = Gitlab.resolve_merge_request_discussion(3, 2, 1, resolved: true)
+    end
+
+    it "puts the correct resource" do
+      expect(a_put("/projects/3/merge_requests/2/discussions/1").
+             with(body: 'resolved=true')).to have_been_made
+    end
+
+    it "returns information about the discussions" do
+      expect(@discussion.id).to eq('7d66bf19bf835e6a4666130544ba1b5c343fc705')
+      note = @discussion.notes.first
+      expect(note['id']).to eq(1758)
+    end
+  end
+
+  describe ".create_merge_request_discussion_note" do
+    before do
+      stub_post("/projects/3/merge_requests/2/discussions/1/notes", "merge_request_discussion_note")
+      @note = Gitlab.create_merge_request_discussion_note(3, 2, 1, body: 'note')
+    end
+
+    it "posts the correct resource" do
+      expect(a_post("/projects/3/merge_requests/2/discussions/1/notes").
+             with(body: 'body=note')).to have_been_made
+    end
+
+    it "returns information about the note" do
+      expect(@note.id).to eq(1775)
+    end
+  end
+
+  describe ".update_merge_request_discussion_note" do
+    before do
+      stub_put("/projects/3/merge_requests/2/discussions/1/notes/1", "merge_request_discussion_note")
+      @note = Gitlab.update_merge_request_discussion_note(3, 2, 1, 1, body: 'note2')
+    end
+
+    it "puts the correct resource" do
+      expect(a_put("/projects/3/merge_requests/2/discussions/1/notes/1").
+             with(body: 'body=note2')).to have_been_made
+    end
+
+    it "returns information about the note" do
+      expect(@note.id).to eq(1775)
+    end
+  end
+
+  describe ".delete_merge_request_discussion_note" do
+    before do
+      stub_request(:delete, "https://api.example.com/projects/3/merge_requests/2/discussions/1/notes/1").to_return(body: '')
+      @note = Gitlab.delete_merge_request_discussion_note(3, 2, 1, 1)
+    end
+
+    it "deletes the correct resource" do
+      expect(a_delete("/projects/3/merge_requests/2/discussions/1/notes/1")).to have_been_made
+    end
+
+    it "returns nothing" do
+      expect(@note).to be_falsy
+    end
+  end
 end

data/spec/gitlab/client/notes_spec.rb

@@ -269,7 +269,7 @@ describe Gitlab::Client do
     context "when wall note" do
       before do
         stub_put("/projects/3/notes/1201", "note")
-        @note = Gitlab.edit_note(3, 1201, body: "edited wall note content")
+        @note = Gitlab.edit_note(3, 1201, "edited wall note content")
       end
 
       it "gets the correct resource" do
@@ -285,7 +285,7 @@ describe Gitlab::Client do
     context "when issue note" do
       before do
         stub_put("/projects/3/issues/7/notes/1201", "note")
-        @note = Gitlab.edit_issue_note(3, 7, 1201, body: "edited issue note content")
+        @note = Gitlab.edit_issue_note(3, 7, 1201, "edited issue note content")
       end
 
       it "gets the correct resource" do
@@ -301,7 +301,7 @@ describe Gitlab::Client do
     context "when snippet note" do
       before do
         stub_put("/projects/3/snippets/7/notes/1201", "note")
-        @note = Gitlab.edit_snippet_note(3, 7, 1201, body: "edited snippet note content")
+        @note = Gitlab.edit_snippet_note(3, 7, 1201, "edited snippet note content")
       end
 
       it "gets the correct resource" do
@@ -317,7 +317,7 @@ describe Gitlab::Client do
     context "when merge request note" do
       before do
         stub_put("/projects/3/merge_requests/7/notes/1201", "note")
-        @note = Gitlab.edit_merge_request_note(3, 7, 1201, body: "edited merge request note content")
+        @note = Gitlab.edit_merge_request_note(3, 7, 1201, "edited merge request note content")
       end
 
       it "gets the correct resource" do

data/spec/gitlab/client/projects_spec.rb

@@ -53,26 +53,6 @@ describe Gitlab::Client do
     end
   end
 
-  describe ".project_events" do
-    before do
-      stub_get("/projects/2/events", "project_events")
-      @events = Gitlab.project_events(2)
-    end
-
-    it "gets the correct resource" do
-      expect(a_get("/projects/2/events")).to have_been_made
-    end
-
-    it "returns a paginated response of events" do
-      expect(@events).to be_a Gitlab::PaginatedResponse
-      expect(@events.size).to eq(2)
-    end
-
-    it "returns the action name of the event" do
-      expect(@events.first.action_name).to eq("opened")
-    end
-  end
-
   describe ".create_project" do
     before do
       stub_post("/projects", "project")
@@ -155,6 +135,23 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".project_forks" do
+    before do
+      stub_get("/projects/3/forks", "project_forks")
+      @project_forks = Gitlab.project_forks(3)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/forks")).to have_been_made
+    end
+
+    it "returns a paginated response of projects found" do
+      expect(@project_forks).to be_a Gitlab::PaginatedResponse
+      expect(@project_forks.first.name).to eq("gitlab")
+      expect(@project_forks.first.owner.name).to eq("Administrator")
+    end
+  end
+
   describe ".team_members" do
     before do
       stub_get("/projects/3/members", "team_members")
@@ -610,4 +607,24 @@ describe Gitlab::Client do
       expect(@unstarred_project.id).to eq(3)
     end
   end
+
+  describe ".user_projects" do
+    let(:user_id) { 1 }
+    let(:project_id) { 1 }
+
+    before do
+      stub_get("/users/#{user_id}/projects", "user_projects")
+      @user_projects = Gitlab.user_projects(user_id)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/users/#{user_id}/projects")).to have_been_made
+    end
+
+    it "returns a paginated response of projects" do
+      expect(@user_projects).to be_a Gitlab::PaginatedResponse
+      expect(@user_projects.first.id).to eq(project_id)
+      expect(@user_projects.first.owner.id).to eq(user_id)
+    end
+  end
 end

data/spec/gitlab/client/runners_spec.rb

@@ -130,6 +130,16 @@ describe Gitlab::Client do
     end
   end
 
+  describe '.runner_jobs' do
+    before do
+      stub_get('/runners/1/jobs', 'runner_jobs')
+      @jobs = Gitlab.runner_jobs(1)
+    end
+    it 'gets the correct resource' do
+      expect(a_get('/runners/1/jobs')).to have_been_made
+    end
+  end
+
   describe ".project_runners" do
     before do
       stub_get("/projects/1/runners", "project_runners")