gitlab 3.0.0 → 4.0.0

data/spec/gitlab/client/groups_spec.rb

@@ -10,30 +10,69 @@ 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"
+    it "should return a paginated response of groups" do
+      expect(@groups).to be_a Gitlab::PaginatedResponse
+      expect(@groups.first.path).to eq("threegroup")
     end
   end
 
   describe ".create_group" do
-    before do
-      stub_post("/groups", "group_create")
-      @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
+    context "without description" do
+      before do
+        stub_post("/groups", "group_create")
+        @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
+      end
+
+      it "should get the correct resource" do
+        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
+        expect(@group.name).to eq("Gitlab-Group")
+        expect(@group.path).to eq("gitlab-group")
+      end
+    end
+
+    context "with description" do
+      before do
+        stub_post("/groups", "group_create_with_description")
+        @group = Gitlab.create_group('GitLab-Group', 'gitlab-path', description: 'gitlab group description')
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/groups").
+                 with(body: { path: 'gitlab-path', name: 'GitLab-Group',
+                              description: 'gitlab group description' })).to have_been_made
+      end
+
+      it "should return information about a created group" do
+        expect(@group.name).to eq("Gitlab-Group")
+        expect(@group.path).to eq("gitlab-group")
+        expect(@group.description).to eq("gitlab group description")
+      end
     end
+  end
 
-    it "should get the correct resource" do
-      a_post("/groups").
-          with(:body => {:path => 'gitlab-path', :name => 'GitLab-Group'}).should have_been_made
-    end
+  describe ".delete_group" do
+    context "without description" do
+      before do
+        stub_delete("/groups/42", "group_delete")
+        @group = Gitlab.delete_group(42)
+      end
 
-    it "should return information about a created group" do
-      @group.name.should == "Gitlab-Group"
-      @group.path.should == "gitlab-group"
+      it "should get the correct resource" do
+        expect(a_delete("/groups/42")).to have_been_made
+      end
+
+      it "should return information about a deleted group" do
+        expect(@group.name).to eq("Gitlab-Group")
+        expect(@group.path).to eq("gitlab-group")
+      end
     end
   end
 
@@ -45,17 +84,17 @@ describe Gitlab::Client do
       @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
 
       stub_post("/groups/#{@group.id}/projects/#{@project.id}", "group_create")
-      @group_transfer = Gitlab.transfer_project_to_group(@group.id,@project.id)
+      @group_transfer = Gitlab.transfer_project_to_group(@group.id, @project.id)
     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 +105,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_a Gitlab::PaginatedResponse
+      expect(@members.size).to eq(2)
+      expect(@members[1].name).to eq("John Smith")
     end
   end
 
@@ -83,12 +122,28 @@ 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 the added member" do
+      expect(@member.name).to eq("John Smith")
+    end
+  end
+
+  describe ".edit_group_member" do
+    before do
+      stub_put("/groups/3/members/1", "group_member_edit")
+      @member = Gitlab.edit_group_member(3, 1, 50)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/groups/3/members/1")
+          .with(body: { access_level: '50'})).to have_been_made
     end
 
-    it "should return information about an added member" do
-      @member.name.should == "John Smith"
+    it "should return information about the edited member" do
+      expect(@member.access_level).to eq(50)
     end
   end
 
@@ -99,13 +154,44 @@ 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
 
+  describe ".group_projects" do
+    before do
+      stub_get("/groups/4/projects", "group_projects")
+      @projects = Gitlab.group_projects(4)
+    end
+
+    it "should get the list of projects" do
+      expect(a_get("/groups/4/projects")).to have_been_made
+    end
 
+    it "should return a list of of projects under a group" do
+      expect(@projects).to be_a Gitlab::PaginatedResponse
+      expect(@projects.size).to eq(1)
+      expect(@projects[0].name).to eq("Diaspora Client")
+    end
+  end
+
+  describe ".group_search" do
+    before do
+      stub_get("/groups?search=Group", "group_search")
+      @groups = Gitlab.group_search('Group')
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/groups?search=Group")).to have_been_made
+    end
+
+    it "should return an array of groups found" do
+      expect(@groups.first.id).to eq(5)
+      expect(@groups.last.id).to eq(8)
+    end
+  end
 end

data/spec/gitlab/client/issues_spec.rb

@@ -9,12 +9,28 @@ 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
+      it "should return a paginated response of project's issues" do
+        expect(@issues).to be_a Gitlab::PaginatedResponse
+        expect(@issues.first.project_id).to eq(3)
+      end
+    end
+
+    context 'with literal project ID passed' do
+      before do
+        stub_get("/projects/gitlab-org%2Fgitlab-ce/issues", "project_issues")
+        @issues = Gitlab.issues('gitlab-org/gitlab-ce')
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/gitlab-org%2Fgitlab-ce/issues")).to have_been_made
+      end
+
+      it "should return a paginated response of project's issues" do
+        expect(@issues).to be_a Gitlab::PaginatedResponse
+        expect(@issues.first.project_id).to eq(3)
       end
     end
 
@@ -25,13 +41,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"
+      it "should return a paginated response of user's issues" do
+        expect(@issues).to be_a Gitlab::PaginatedResponse
+        expect(@issues.first.closed).to be_falsey
+        expect(@issues.first.author.name).to eq("John Smith")
       end
     end
   end
@@ -43,12 +59,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,30 +75,30 @@ 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
 
   describe ".edit_issue" do
     before do
       stub_put("/projects/3/issues/33", "issue")
-      @issue = Gitlab.edit_issue(3, 33, :title => 'title')
+      @issue = Gitlab.edit_issue(3, 33, title: 'title')
     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 +109,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 +126,61 @@ 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
+
+  describe ".subscribe_to_issue" do
+    before do
+      stub_post("/projects/3/issues/33/subscribe", "issue")
+      @issue = Gitlab.subscribe_to_issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/issues/33/subscribe")).to have_been_made
+    end
+
+    it "should return information about the subscribed issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".unsubscribe_from_issue" do
+    before do
+      stub_post("/projects/3/issues/33/unsubscribe", "issue")
+      @issue = Gitlab.unsubscribe_from_issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/issues/33/unsubscribe")).to have_been_made
+    end
+
+    it "should return information about the unsubscribed issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".delete_issue" do
+    before do
+      stub_delete("/projects/3/issues/33", "issue")
+      @issue = Gitlab.delete_issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/3/issues/33")).to have_been_made
+    end
+
+    it "should return information about a deleted issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.id).to eq(33)
     end
   end
 end

data/spec/gitlab/client/labels_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".labels" do
+    before do
+      stub_get("/projects/3/labels", "labels")
+      @labels = Gitlab.labels(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/labels")).to have_been_made
+    end
+
+    it "should return a paginated response of project's labels" do
+      expect(@labels).to be_a Gitlab::PaginatedResponse
+      expect(@labels.first.name).to eq("Backlog")
+    end
+  end
+
+  describe ".delete" do
+    before do
+      stub_delete("/projects/3/labels", "label")
+      @label = Gitlab.delete_label(3, "Backlog")
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/3/labels").
+             with(body: { name: 'Backlog' })).to have_been_made
+    end
+
+    it "should return information about a deleted snippet" do
+      expect(@label.name).to eq("Backlog")
+    end
+  end
+
+  describe ".edit_label" do
+    before do
+      stub_put("/projects/3/labels", "label")
+      @label = Gitlab.edit_label(3, "TODO", new_name: 'Backlog')
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/labels").
+             with(body: { name: 'TODO', new_name: "Backlog" })).to have_been_made
+    end
+
+    it "should return information about an edited label" do
+      expect(@label.name).to eq("Backlog")
+    end
+  end
+
+  describe ".create_label" do
+    before do
+      stub_post("/projects/3/labels", "label")
+      @label = Gitlab.create_label(3, 'Backlog', '#DD10AA')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/labels").
+             with(body: { name: 'Backlog', color: '#DD10AA' })).to have_been_made
+    end
+
+    it "should return information about a created label" do
+      expect(@label.name).to eq('Backlog')
+      expect(@label.color).to eq('#DD10AA')
+    end
+  end
+end