gitlab 3.0.0 → 3.1.0

data/spec/gitlab/client/branches_spec.rb

@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :repo_branches }
+  it { should respond_to :repo_branch }
+  it { should respond_to :repo_protect_branch }
+  it { should respond_to :repo_unprotect_branch }
+
+  describe ".branches" do
+    before do
+      stub_get("/projects/3/repository/branches", "branches")
+      @branches = Gitlab.branches(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/branches")).to have_been_made
+    end
+
+    it "should return an array of repository branches" do
+      expect(@branches).to be_an Array
+      expect(@branches.first.name).to eq("api")
+    end
+  end
+
+  describe ".branch" do
+    before do
+      stub_get("/projects/3/repository/branches/api", "branch")
+      @branch = Gitlab.branch(3, "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/branches/api")).to have_been_made
+    end
+
+    it "should return information about a repository branch" do
+      expect(@branch.name).to eq("api")
+    end
+  end
+
+  describe ".protect_branch" do
+    before do
+      stub_put("/projects/3/repository/branches/api/protect", "protect_branch")
+      @branch = Gitlab.protect_branch(3, "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/repository/branches/api/protect")).to have_been_made
+    end
+
+    it "should return information about a protected repository branch" do
+      expect(@branch.name).to eq("api")
+      expect(@branch.protected).to eq(true)
+    end
+  end
+
+  describe ".unprotect_branch" do
+    before do
+      stub_put("/projects/3/repository/branches/api/unprotect", "unprotect_branch")
+      @branch = Gitlab.unprotect_branch(3, "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/repository/branches/api/unprotect")).to have_been_made
+    end
+
+    it "should return information about an unprotected repository branch" do
+      expect(@branch.name).to eq("api")
+      expect(@branch.protected).to eq(false)
+    end
+  end
+
+  describe ".create_branch" do
+    context "with branch name" do
+      before do
+        stub_post("/projects/3/repository/branches", "create_branch")
+        @branch = Gitlab.create_branch(3, "api","master")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/repository/branches")).to have_been_made
+      end
+
+      it "should return information about a new repository branch" do
+        expect(@branch.name).to eq("api")
+      end
+    end
+    context "with commit hash" do
+      before do
+        stub_post("/projects/3/repository/branches", "create_branch")
+        @branch = Gitlab.create_branch(3, "api","949b1df930bedace1dbd755aaa4a82e8c451a616")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/repository/branches")).to have_been_made
+      end
+
+      it "should return information about a new repository branch" do
+        expect(@branch.name).to eq("api")
+      end
+    end
+  end
+
+end

data/spec/gitlab/client/groups_spec.rb

@@ -10,13 +10,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/groups").should have_been_made
-      a_get("/groups/3").should have_been_made
+      expect(a_get("/groups")).to have_been_made
+      expect(a_get("/groups/3")).to have_been_made
     end
 
     it "should return an array of Groups" do
-      @groups.should be_an Array
-      @groups.first.path.should == "threegroup"
+      expect(@groups).to be_an Array
+      expect(@groups.first.path).to eq("threegroup")
     end
   end
 
@@ -27,13 +27,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_post("/groups").
-          with(:body => {:path => 'gitlab-path', :name => 'GitLab-Group'}).should have_been_made
+      expect(a_post("/groups").
+          with(:body => {:path => 'gitlab-path', :name => 'GitLab-Group'})).to have_been_made
     end
 
     it "should return information about a created group" do
-      @group.name.should == "Gitlab-Group"
-      @group.path.should == "gitlab-group"
+      expect(@group.name).to eq("Gitlab-Group")
+      expect(@group.path).to eq("gitlab-group")
     end
   end
 
@@ -49,13 +49,13 @@ describe Gitlab::Client do
     end
 
     it "should post to the correct resource" do
-      a_post("/groups/#{@group.id}/projects/#{@project.id}").with(:body => {:id => @group.id.to_s, :project_id => @project.id.to_s}).should have_been_made
+      expect(a_post("/groups/#{@group.id}/projects/#{@project.id}").with(:body => {:id => @group.id.to_s, :project_id => @project.id.to_s})).to have_been_made
     end
 
     it "should return information about the group" do
-      @group_transfer.name.should == @group.name
-      @group_transfer.path.should == @group.path
-      @group_transfer.id.should == @group.id
+      expect(@group_transfer.name).to eq(@group.name)
+      expect(@group_transfer.path).to eq(@group.path)
+      expect(@group_transfer.id).to eq(@group.id)
     end
   end
 
@@ -66,13 +66,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/groups/3/members").should have_been_made
+      expect(a_get("/groups/3/members")).to have_been_made
     end
 
     it "should return information about a group members" do
-      @members.should be_an Array
-      @members.size.should == 2
-      @members[1].name.should == "John Smith"
+      expect(@members).to be_an Array
+      expect(@members.size).to eq(2)
+      expect(@members[1].name).to eq("John Smith")
     end
   end
 
@@ -83,12 +83,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_post("/groups/3/members").
-        with(:body => {:user_id => '1', :access_level => '40'}).should have_been_made
+      expect(a_post("/groups/3/members").
+        with(:body => {:user_id => '1', :access_level => '40'})).to have_been_made
     end
 
     it "should return information about an added member" do
-      @member.name.should == "John Smith"
+      expect(@member.name).to eq("John Smith")
     end
   end
 
@@ -99,11 +99,11 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_delete("/groups/3/members/1").should have_been_made
+      expect(a_delete("/groups/3/members/1")).to have_been_made
     end
 
     it "should return information about the group the member was removed from" do
-      @group.group_id.should == 3
+      expect(@group.group_id).to eq(3)
     end
   end
 

data/spec/gitlab/client/issues_spec.rb

@@ -9,12 +9,12 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/projects/3/issues").should have_been_made
+        expect(a_get("/projects/3/issues")).to have_been_made
       end
 
       it "should return an array of project's issues" do
-        @issues.should be_an Array
-        @issues.first.project_id.should == 3
+        expect(@issues).to be_an Array
+        expect(@issues.first.project_id).to eq(3)
       end
     end
 
@@ -25,13 +25,13 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/issues").should have_been_made
+        expect(a_get("/issues")).to have_been_made
       end
 
       it "should return an array of user's issues" do
-        @issues.should be_an Array
-        @issues.first.closed.should be_false
-        @issues.first.author.name.should == "John Smith"
+        expect(@issues).to be_an Array
+        expect(@issues.first.closed).to be_false
+        expect(@issues.first.author.name).to eq("John Smith")
       end
     end
   end
@@ -43,12 +43,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/issues/33").should have_been_made
+      expect(a_get("/projects/3/issues/33")).to have_been_made
     end
 
     it "should return information about an issue" do
-      @issue.project_id.should == 3
-      @issue.assignee.name.should == "Jack Smith"
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
     end
   end
 
@@ -59,13 +59,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_post("/projects/3/issues").
-        with(:body => {:title => 'title'}).should have_been_made
+      expect(a_post("/projects/3/issues").
+        with(:body => {:title => 'title'})).to have_been_made
     end
 
     it "should return information about a created issue" do
-      @issue.project_id.should == 3
-      @issue.assignee.name.should == "Jack Smith"
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
     end
   end
 
@@ -76,13 +76,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_put("/projects/3/issues/33").
-        with(:body => {:title => 'title'}).should have_been_made
+      expect(a_put("/projects/3/issues/33").
+        with(:body => {:title => 'title'})).to have_been_made
     end
 
     it "should return information about an edited issue" do
-      @issue.project_id.should == 3
-      @issue.assignee.name.should == "Jack Smith"
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
     end
   end
 
@@ -93,13 +93,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_put("/projects/3/issues/33").
-        with(:body => {:state_event => 'close'}).should have_been_made
+      expect(a_put("/projects/3/issues/33").
+        with(:body => {:state_event => 'close'})).to have_been_made
     end
 
     it "should return information about an closed issue" do
-      @issue.project_id.should == 3
-      @issue.assignee.name.should == "Jack Smith"
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
     end
   end
 
@@ -110,13 +110,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_put("/projects/3/issues/33").
-        with(:body => {:state_event => 'reopen'}).should have_been_made
+      expect(a_put("/projects/3/issues/33").
+        with(:body => {:state_event => 'reopen'})).to have_been_made
     end
 
     it "should return information about an reopened issue" do
-      @issue.project_id.should == 3
-      @issue.assignee.name.should == "Jack Smith"
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
     end
   end
 end

data/spec/gitlab/client/merge_requests_spec.rb

@@ -8,12 +8,12 @@ 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
+      expect(@merge_requests).to be_an Array
+      expect(@merge_requests.first.project_id).to eq(3)
     end
   end
 
@@ -24,12 +24,12 @@ describe Gitlab::Client do
     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_request/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
 
@@ -55,9 +55,9 @@ describe Gitlab::Client do
         :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'
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
+      expect(@merge_request.title).to eq('New feature')
     end
   end
 
@@ -72,9 +72,41 @@ describe Gitlab::Client do
     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")
+      expect(@merge_request.title).to eq('A different new feature')
+    end
+  end
+
+  describe ".merge_request_comments" do
+    before do
+      stub_get("/projects/3/merge_request/2/comments", "merge_request_comments")
+      @merge_request = Gitlab.merge_request_comments(3, 2)
+    end
+
+    it "should return merge request's comments" do
+      expect(@merge_request).to be_an Array
+      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 ".merge_request_comments" do
+    before do
+      stub_get("/projects/3/merge_request/2/comments", "merge_request_comments")
+      @merge_request = Gitlab.merge_request_comments(3, 2)
+    end
+
+    it "should return merge request's comments" do
+      expect(@merge_request).to be_an Array
+      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
 
@@ -85,7 +117,7 @@ describe Gitlab::Client do
 
     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!'
+      expect(@merge_request.note).to eq('Cool Merge Request!')
       @merge_request.author.id == 1
     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
+      expect(@milestones).to be_an Array
+      expect(@milestones.first.project_id).to eq(3)
     end
   end
 
@@ -24,11 +24,11 @@ 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
 
@@ -39,12 +39,12 @@ 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
 
@@ -55,12 +55,12 @@ describe Gitlab::Client do
     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