gitlab 3.0.0 → 4.0.0

data/spec/gitlab/client/merge_requests_spec.rb

@@ -8,85 +8,217 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/merge_requests").should have_been_made
+      expect(a_get("/projects/3/merge_requests")).to have_been_made
     end
 
-    it "should return an array of project's merge requests" do
-      @merge_requests.should be_an Array
-      @merge_requests.first.project_id.should == 3
+    it "should return a paginated response of project's merge requests" do
+      expect(@merge_requests).to be_a Gitlab::PaginatedResponse
+      expect(@merge_requests.first.project_id).to eq(3)
     end
   end
 
   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
-      a_get("/projects/3/merge_request/1").should 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
-      @merge_request.project_id.should == 3
-      @merge_request.assignee.name.should == "Jack Smith"
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
     end
   end
 
   describe ".create_merge_request" do
     before do
-      stub_post("/projects/3/merge_requests", "create_merge_request")
-    end
-
-    it "should fail if it doesn't have a source_branch" do
-      expect {
-        Gitlab.create_merge_request(3, 'New merge request', :target_branch => 'master')
-      }.to raise_error Gitlab::Error::MissingAttributes
-    end
-
-    it "should fail if it doesn't have a target_branch" do
-      expect {
-        Gitlab.create_merge_request(3, 'New merge request', :source_branch => 'dev')
-      }.to raise_error Gitlab::Error::MissingAttributes
+      stub_post("/projects/3/merge_requests", "merge_request")
     end
 
     it "should return information about a merge request" do
       @merge_request = Gitlab.create_merge_request(3, 'New feature',
-        :source_branch => 'api',
-        :target_branch => 'master'
-      )
-      @merge_request.project_id.should == 3
-      @merge_request.assignee.name.should == "Jack Smith"
-      @merge_request.title.should == 'New feature'
+                                                   source_branch: 'api',
+                                                   target_branch: 'master'
+                                                  )
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
     end
   end
 
   describe ".update_merge_request" do
     before do
-      stub_put("/projects/3/merge_request/2", "update_merge_request")
+      stub_put("/projects/3/merge_requests/2", "merge_request").
+        with(body: {
+               assignee_id: '1',
+               target_branch: 'master',
+               title: 'A different new feature'
+             })
       @merge_request = Gitlab.update_merge_request(3, 2,
-        :assignee_id   => '1',
-        :target_branch => 'master',
-        :title         => 'A different new feature'
-      )
+                                                   assignee_id: '1',
+                                                   target_branch: 'master',
+                                                   title: 'A different new feature'
+                                                  )
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/merge_requests/2").
+        with(body: {
+               assignee_id: '1',
+               target_branch: 'master',
+               title: 'A different new feature'
+             })).to have_been_made
     end
 
     it "should return information about a merge request" do
-      @merge_request.project_id.should == 3
-      @merge_request.assignee.name.should == "Jack Smith"
-      @merge_request.title.should == 'A different new feature'
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".accept_merge_request" do
+    before do
+      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_requests/42/merge").
+        with(body: { merge_commit_message: 'Nice!' })).to have_been_made
+    end
+
+    it "should return information about merged merge request" do
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".merge_request_comments" do
+    before do
+      stub_get("/projects/3/merge_requests/2/notes", "merge_request_comments")
+      @merge_request = Gitlab.merge_request_comments(3, 2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/merge_requests/2/notes")).to have_been_made
+    end
+
+    it "should return merge request's comments" do
+      expect(@merge_request).to be_an Gitlab::PaginatedResponse
+      expect(@merge_request.length).to eq(2)
+      expect(@merge_request[0].note).to eq("this is the 1st comment on the 2merge merge request")
+      expect(@merge_request[0].author.id).to eq(11)
+      expect(@merge_request[1].note).to eq("another discussion point on the 2merge request")
+      expect(@merge_request[1].author.id).to eq(12)
     end
   end
 
   describe ".create_merge_request_comment" do
     before do
-      stub_post("/projects/3/merge_request/2/comments", "comment_merge_request")
+      stub_post("/projects/3/merge_requests/2/notes", "merge_request_comment")
+      @merge_request = Gitlab.create_merge_request_comment(3, 2, 'Cool Merge Request!')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/merge_requests/2/notes")).to have_been_made
     end
 
     it "should return information about a merge request" do
-      @merge_request = Gitlab.create_merge_request_comment(3, 2, 'Cool Merge Request!')
-      @merge_request.note.should == 'Cool Merge Request!'
-      @merge_request.author.id == 1
+      expect(@merge_request.note).to eq('Cool Merge Request!')
+      expect(@merge_request.author.id).to eq(1)
+    end
+  end
+
+  describe ".merge_request_changes" do
+    before do
+      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_requests/2/changes")).to have_been_made
+    end
+
+    it "should return the merge request changes" do
+      expect(@mr_changes.changes).to be_a Array
+      expect(@mr_changes.changes.first['old_path']).to eq('lib/omniauth/builder.rb')
+      expect(@mr_changes.id).to eq(2)
+      expect(@mr_changes.project_id).to eq(3)
+      expect(@mr_changes.source_branch).to eq('uncovered')
+      expect(@mr_changes.target_branch).to eq('master')
+    end
+  end
+
+  describe ".merge_request_commits" do
+    before do
+      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_requests/2/commits")).to have_been_made
+    end
+
+    it "should return the merge request commits" do
+      expect(@mr_commits).to be_a Gitlab::PaginatedResponse
+      expect(@mr_commits.size).to eq 2
+      expect(@mr_commits.first.id).to eq "a2da7552f26d5b46a6a09bb8b7b066e3a102be7d"
+      expect(@mr_commits.first.short_id).to eq "a2da7552"
+      expect(@mr_commits.first.title).to eq "piyo"
+      expect(@mr_commits.first.author_name).to eq "example"
+      expect(@mr_commits.first.author_email).to eq "example@example.com"
+      expect(@mr_commits[1].short_id).to eq "3ce50959"
+      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

@@ -8,12 +8,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/milestones").should have_been_made
+      expect(a_get("/projects/3/milestones")).to have_been_made
     end
 
-    it "should return an array of project's milestones" do
-      @milestones.should be_an Array
-      @milestones.first.project_id.should == 3
+    it "should return a paginated response of project's milestones" do
+      expect(@milestones).to be_a Gitlab::PaginatedResponse
+      expect(@milestones.first.project_id).to eq(3)
     end
   end
 
@@ -24,11 +24,43 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/milestones/1").should have_been_made
+      expect(a_get("/projects/3/milestones/1")).to have_been_made
     end
 
     it "should return information about a milestone" do
-      @milestone.project_id.should == 3
+      expect(@milestone.project_id).to eq(3)
+    end
+  end
+
+  describe ".milestone_issues" do
+    before do
+      stub_get("/projects/3/milestones/1/issues", "milestone_issues")
+      @milestone_issues = Gitlab.milestone_issues(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/milestones/1/issues")).to have_been_made
+    end
+
+    it "should return 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 ".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
 
@@ -39,28 +71,28 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_post("/projects/3/milestones").
-        with(:body => {:title => 'title'}).should have_been_made
+      expect(a_post("/projects/3/milestones").
+        with(body: { title: 'title' })).to have_been_made
     end
 
     it "should return information about a created milestone" do
-      @milestone.project_id.should == 3
+      expect(@milestone.project_id).to eq(3)
     end
   end
 
   describe ".edit_milestone" do
     before do
       stub_put("/projects/3/milestones/33", "milestone")
-      @milestone = Gitlab.edit_milestone(3, 33, :title => 'title')
+      @milestone = Gitlab.edit_milestone(3, 33, title: 'title')
     end
 
     it "should get the correct resource" do
-      a_put("/projects/3/milestones/33").
-        with(:body => {:title => 'title'}).should have_been_made
+      expect(a_put("/projects/3/milestones/33").
+        with(body: { title: 'title' })).to have_been_made
     end
 
     it "should return information about an edited milestone" do
-      @milestone.project_id.should == 3
+      expect(@milestone.project_id).to eq(3)
     end
   end
 end

data/spec/gitlab/client/namespaces_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :namespaces }
+
+  describe ".namespaces" do
+    before do
+      stub_get("/namespaces", "namespaces")
+      @namespaces = Gitlab.namespaces
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/namespaces")).to have_been_made
+    end
+
+    it "should return a paginated response of namespaces" do
+      expect(@namespaces).to be_a Gitlab::PaginatedResponse
+      expect(@namespaces.first.path).to eq("john")
+      expect(@namespaces.first.kind).to eq("user")
+    end
+  end
+end

data/spec/gitlab/client/notes_spec.rb

@@ -9,12 +9,12 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/projects/3/notes").should have_been_made
+        expect(a_get("/projects/3/notes")).to have_been_made
       end
 
-      it "should return an array of notes" do
-        @notes.should be_an Array
-        @notes.first.author.name.should == "John Smith"
+      it "should return a paginated response of notes" do
+        expect(@notes).to be_a Gitlab::PaginatedResponse
+        expect(@notes.first.author.name).to eq("John Smith")
       end
     end
 
@@ -25,12 +25,12 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/projects/3/issues/7/notes").should have_been_made
+        expect(a_get("/projects/3/issues/7/notes")).to have_been_made
       end
 
-      it "should return an array of notes" do
-        @notes.should be_an Array
-        @notes.first.author.name.should == "John Smith"
+      it "should return a paginated response of notes" do
+        expect(@notes).to be_a Gitlab::PaginatedResponse
+        expect(@notes.first.author.name).to eq("John Smith")
       end
     end
 
@@ -41,12 +41,28 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/projects/3/snippets/7/notes").should have_been_made
+        expect(a_get("/projects/3/snippets/7/notes")).to have_been_made
       end
 
-      it "should return an array of notes" do
-        @notes.should be_an Array
-        @notes.first.author.name.should == "John Smith"
+      it "should return a paginated response of notes" do
+        expect(@notes).to be_a Gitlab::PaginatedResponse
+        expect(@notes.first.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when merge_request notes" do
+      before do
+        stub_get("/projects/3/merge_requests/7/notes", "notes")
+        @notes = Gitlab.merge_request_notes(3, 7)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/merge_requests/7/notes")).to have_been_made
+      end
+
+      it "should return a paginated response of notes" do
+        expect(@notes).to be_a Gitlab::PaginatedResponse
+        expect(@notes.first.author.name).to eq("John Smith")
       end
     end
   end
@@ -59,12 +75,12 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/projects/3/notes/1201").should have_been_made
+        expect(a_get("/projects/3/notes/1201")).to have_been_made
       end
 
       it "should return information about a note" do
-        @note.body.should == "The solution is rather tricky"
-        @note.author.name.should == "John Smith"
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
       end
     end
 
@@ -75,12 +91,12 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/projects/3/issues/7/notes/1201").should have_been_made
+        expect(a_get("/projects/3/issues/7/notes/1201")).to have_been_made
       end
 
       it "should return information about a note" do
-        @note.body.should == "The solution is rather tricky"
-        @note.author.name.should == "John Smith"
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
       end
     end
 
@@ -91,12 +107,28 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/projects/3/snippets/7/notes/1201").should have_been_made
+        expect(a_get("/projects/3/snippets/7/notes/1201")).to have_been_made
       end
 
       it "should return information about a note" do
-        @note.body.should == "The solution is rather tricky"
-        @note.author.name.should == "John Smith"
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when merge request note" do
+      before do
+        stub_get("/projects/3/merge_requests/7/notes/1201", "note")
+        @note = Gitlab.merge_request_note(3, 7, 1201)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/merge_requests/7/notes/1201")).to have_been_made
+      end
+
+      it "should return information about a note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
       end
     end
   end
@@ -109,13 +141,13 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_post("/projects/3/notes").
-          with(:body => {:body => 'The solution is rather tricky'}).should have_been_made
+        expect(a_post("/projects/3/notes").
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
       it "should return information about a created note" do
-        @note.body.should == "The solution is rather tricky"
-        @note.author.name.should == "John Smith"
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
       end
     end
 
@@ -126,13 +158,13 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_post("/projects/3/issues/7/notes").
-          with(:body => {:body => 'The solution is rather tricky'}).should have_been_made
+        expect(a_post("/projects/3/issues/7/notes").
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
       it "should return information about a created note" do
-        @note.body.should == "The solution is rather tricky"
-        @note.author.name.should == "John Smith"
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
       end
     end
 
@@ -143,13 +175,30 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_post("/projects/3/snippets/7/notes").
-          with(:body => {:body => 'The solution is rather tricky'}).should have_been_made
+        expect(a_post("/projects/3/snippets/7/notes").
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
+      end
+
+      it "should return information about a created note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when merge_request note" do
+      before do
+        stub_post("/projects/3/merge_requests/7/notes", "note")
+        @note = Gitlab.create_merge_request_note(3, 7, "The solution is rather tricky")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/merge_requests/7/notes").
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
       it "should return information about a created note" do
-        @note.body.should == "The solution is rather tricky"
-        @note.author.name.should == "John Smith"
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
       end
     end
   end