gitlab 4.2.0 → 4.3.0

data/spec/gitlab/client/commits_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Gitlab::Client do
-  it { should respond_to :repo_commits }
-  it { should respond_to :repo_commit }
-  it { should respond_to :repo_commit_diff }
-  it { should respond_to :repo_commit_comments }
-  it { should respond_to :repo_create_commit_comment }
-  it { should respond_to :repo_commit_status }
-  it { should respond_to :repo_update_commit_status }
+  it { is_expected.to respond_to :repo_commits }
+  it { is_expected.to respond_to :repo_commit }
+  it { is_expected.to respond_to :repo_commit_diff }
+  it { is_expected.to respond_to :repo_commit_comments }
+  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 }
 
   describe ".commits" do
     before do
@@ -16,12 +16,12 @@ describe Gitlab::Client do
       @commits = Gitlab.commits(3, ref_name: "api")
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/repository/commits").
         with(query: { ref_name: "api" })).to have_been_made
     end
 
-    it "should return a paginated response of repository commits" do
+    it "returns a paginated response of repository commits" do
       expect(@commits).to be_a Gitlab::PaginatedResponse
       expect(@commits.first.id).to eq("f7dd067490fe57505f7226c3b54d3127d2f7fd46")
     end
@@ -33,12 +33,12 @@ describe Gitlab::Client do
       @commit = Gitlab.commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6")).
         to have_been_made
     end
 
-    it "should return a repository commit" do
+    it "returns a repository commit" do
       expect(@commit.id).to eq("6104942438c14ec7bd21c6cd5bd995272b3faff6")
     end
   end
@@ -49,12 +49,12 @@ describe Gitlab::Client do
       @diff = Gitlab.commit_diff(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/diff")).
         to have_been_made
     end
 
-    it "should return a diff of a commit" do
+    it "returns a diff of a commit" do
       expect(@diff.new_path).to eq("doc/update/5.4-to-6.0.md")
     end
   end
@@ -65,12 +65,12 @@ describe Gitlab::Client do
       @commit_comments = Gitlab.commit_comments(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/comments")).
         to have_been_made
     end
 
-    it "should return commit's comments" do
+    it "returns commit's comments" do
       expect(@commit_comments).to be_a Gitlab::PaginatedResponse
       expect(@commit_comments.length).to eq(2)
       expect(@commit_comments[0].note).to eq("this is the 1st comment on commit 6104942438c14ec7bd21c6cd5bd995272b3faff6")
@@ -86,7 +86,7 @@ describe Gitlab::Client do
       @merge_request = Gitlab.create_commit_comment(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'Nice code!')
     end
 
-    it "should return information about the newly created comment" do
+    it "returns information about the newly created comment" do
       expect(@merge_request.note).to eq('Nice code!')
       expect(@merge_request.author.id).to eq(1)
     end
@@ -99,12 +99,12 @@ describe Gitlab::Client do
       @statuses = Gitlab.commit_status(6, '7d938cb8ac15788d71f4b67c035515a160ea76d8', all: true)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/6/repository/commits/7d938cb8ac15788d71f4b67c035515a160ea76d8/statuses").
         with(query: { all: true }))
     end
 
-    it "should get statuses of a commit" do
+    it "gets statuses of a commit" do
       expect(@statuses).to be_kind_of Gitlab::PaginatedResponse
       expect(@statuses.first.sha).to eq('7d938cb8ac15788d71f4b67c035515a160ea76d8')
       expect(@statuses.first.ref).to eq('decreased-spec')
@@ -121,12 +121,12 @@ describe Gitlab::Client do
       @status = Gitlab.update_commit_status(6, '7d938cb8ac15788d71f4b67c035515a160ea76d8', 'failed', name: 'test', ref: 'decreased-spec')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post('/projects/6/statuses/7d938cb8ac15788d71f4b67c035515a160ea76d8').
         with(query: { name: 'test', ref: 'decreased-spec', state: 'failed' }))
     end
 
-    it "should information about the newly created status" do
+    it "returns information about the newly created status" do
       expect(@status).to be_kind_of Gitlab::ObjectifiedHash
       expect(@status.id).to eq(498)
       expect(@status.sha).to eq('7d938cb8ac15788d71f4b67c035515a160ea76d8')
@@ -161,7 +161,7 @@ describe Gitlab::Client do
       @commit = Gitlab.create_commit(6, 'dev', 'refactors everything', actions, {author_email: 'joe@sample.org', author_name: 'Joe Sample'})
     end
 
-    it "should return id of a created commit" do
+    it "returns id of a created commit" do
       expect(@commit.id).to eq('ed899a2f4b50b4370feeea94676502b42383c746')
     end
   end

data/spec/gitlab/client/deployments_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".deployments" do
+    before do
+      stub_get("/projects/3/deployments", "deployments")
+      @deployments = Gitlab.deployments(3)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/deployments")).to have_been_made
+    end
+
+    it "returns a paginated response of project's deployments" do
+      expect(@deployments).to be_a Gitlab::PaginatedResponse
+    end
+  end
+
+  describe ".deployment" do
+    before do
+      stub_get("/projects/3/deployments/42", "deployment")
+      @deployment = Gitlab.deployment(3, 42)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/deployments/42")).to have_been_made
+    end
+
+    it "returns a single deployment" do
+      expect(@deployment).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "returns information about an deployment" do
+      expect(@deployment.id).to eq(42)
+      expect(@deployment.deployable.commit.id).to eq("a91957a858320c0e17f3a0eca7cfacbff50ea29a")
+    end
+  end
+end

data/spec/gitlab/client/environments_spec.rb

@@ -7,11 +7,11 @@ describe Gitlab::Client do
       @environments = Gitlab.environments(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/environments")).to have_been_made
     end
 
-    it "should return a paginated response of project's environments" do
+    it "returns a paginated response of project's environments" do
       expect(@environments).to be_a Gitlab::PaginatedResponse
     end
   end
@@ -22,15 +22,15 @@ describe Gitlab::Client do
       @environment = Gitlab.environment(3, 12)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/environments/12")).to have_been_made
     end
 
-    it "should return a single environment" do
+    it "returns a single environment" do
       expect(@environment).to be_a Gitlab::ObjectifiedHash
     end
 
-    it "should return information about an environment" do
+    it "returns information about an environment" do
       expect(@environment.id).to eq(12)
       expect(@environment.name).to eq("staging")
     end
@@ -43,15 +43,15 @@ describe Gitlab::Client do
         @environment = Gitlab.create_environment(3, 'staging')
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_post("/projects/3/environments").with(body: { name: 'staging' })).to have_been_made
       end
 
-      it "should return a single environment" do
+      it "returns a single environment" do
         expect(@environment).to be_a Gitlab::ObjectifiedHash
       end
 
-      it "should return information about an environment" do
+      it "returns information about an environment" do
         expect(@environment.name).to eq("staging")
       end
     end
@@ -62,7 +62,7 @@ describe Gitlab::Client do
         @environment = Gitlab.create_environment(3, 'staging', external_url: "https://staging.example.gitlab.com")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_post("/projects/3/environments")
                  .with(body: { name: 'staging', external_url: "https://staging.example.gitlab.com" })).to have_been_made
       end
@@ -78,16 +78,16 @@ describe Gitlab::Client do
       })
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_put("/projects/3/environments/12")
                .with(body: { name: 'staging', external_url: "https://staging.example.gitlab.com" })).to have_been_made
     end
 
-    it "should return a single environment" do
+    it "returns a single environment" do
       expect(@environment).to be_a Gitlab::ObjectifiedHash
     end
 
-    it "should return information about an environment" do
+    it "returns information about an environment" do
       expect(@environment.name).to eq("staging")
     end
   end
@@ -98,15 +98,15 @@ describe Gitlab::Client do
       @environment = Gitlab.delete_environment(3, 12)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/projects/3/environments/12")).to have_been_made
     end
 
-    it "should return a single pipeline" do
+    it "returns a single pipeline" do
       expect(@environment).to be_a Gitlab::ObjectifiedHash
     end
 
-    it "should return information about a pipeline" do
+    it "returns information about a pipeline" do
       expect(@environment.name).to eq("staging")
     end
   end
@@ -117,15 +117,15 @@ describe Gitlab::Client do
       @environment = Gitlab.stop_environment(3, 12)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/environments/12/stop")).to have_been_made
     end
 
-    it "should return a single pipeline" do
+    it "returns a single pipeline" do
       expect(@environment).to be_a Gitlab::ObjectifiedHash
     end
 
-    it "should return information about a pipeline" do
+    it "returns information about a pipeline" do
       expect(@environment.name).to eq("staging")
     end
   end

data/spec/gitlab/client/groups_spec.rb

@@ -9,12 +9,12 @@ describe Gitlab::Client do
       @groups = Gitlab.groups
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/groups")).to have_been_made
       expect(a_get("/groups/3")).to have_been_made
     end
 
-    it "should return a paginated response of groups" do
+    it "returns a paginated response of groups" do
       expect(@groups).to be_a Gitlab::PaginatedResponse
       expect(@groups.first.path).to eq("threegroup")
     end
@@ -27,12 +27,12 @@ describe Gitlab::Client do
         @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
       end
 
-      it "should get the correct resource" do
+      it "gets 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
+      it "returns information about a created group" do
         expect(@group.name).to eq("Gitlab-Group")
         expect(@group.path).to eq("gitlab-group")
       end
@@ -44,13 +44,13 @@ describe Gitlab::Client do
         @group = Gitlab.create_group('GitLab-Group', 'gitlab-path', description: 'gitlab group description')
       end
 
-      it "should get the correct resource" do
+      it "gets 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
+      it "returns 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")
@@ -64,11 +64,11 @@ describe Gitlab::Client do
       @group = Gitlab.delete_group(42)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/groups/42")).to have_been_made
     end
 
-    it "should return information about a deleted group" do
+    it "returns information about a deleted group" do
       expect(@group.name).to eq("Gitlab-Group")
       expect(@group.path).to eq("gitlab-group")
     end
@@ -85,11 +85,11 @@ describe Gitlab::Client do
       @group_transfer = Gitlab.transfer_project_to_group(@group.id, @project.id)
     end
 
-    it "should post to the correct resource" do
+    it "posts to the correct resource" do
       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
+    it "returns information about the group" do
       expect(@group_transfer.name).to eq(@group.name)
       expect(@group_transfer.path).to eq(@group.path)
       expect(@group_transfer.id).to eq(@group.id)
@@ -102,29 +102,46 @@ describe Gitlab::Client do
       @members = Gitlab.group_members(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/groups/3/members")).to have_been_made
     end
 
-    it "should return information about a group members" do
+    it "returns information about a group's members" do
       expect(@members).to be_a Gitlab::PaginatedResponse
       expect(@members.size).to eq(2)
       expect(@members[1].name).to eq("John Smith")
     end
   end
 
+  describe ".group_member" do
+    before do
+      stub_get("/groups/3/members/2", "group_member")
+      @member = Gitlab.group_member(3, 2)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/groups/3/members/2")).to have_been_made
+    end
+
+    it "returns information about a group member" do
+      expect(@member).to be_a Gitlab::ObjectifiedHash
+      expect(@member.access_level).to eq(10)
+      expect(@member.name).to eq("John Smith")
+    end
+  end
+
   describe ".add_group_member" do
     before do
       stub_post("/groups/3/members", "group_member")
       @member = Gitlab.add_group_member(3, 1, 40)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       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
+    it "returns information about the added member" do
       expect(@member.name).to eq("John Smith")
     end
   end
@@ -135,12 +152,12 @@ describe Gitlab::Client do
       @member = Gitlab.edit_group_member(3, 1, 50)
     end
 
-    it "should get the correct resource" do
+    it "gets 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 the edited member" do
+    it "returns information about the edited member" do
       expect(@member.access_level).to eq(50)
     end
   end
@@ -151,11 +168,11 @@ describe Gitlab::Client do
       @group = Gitlab.remove_group_member(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       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
+    it "returns information about the group the member was removed from" do
       expect(@group.group_id).to eq(3)
     end
   end
@@ -166,11 +183,11 @@ describe Gitlab::Client do
       @projects = Gitlab.group_projects(4)
     end
 
-    it "should get the list of projects" do
+    it "gets 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
+    it "returns 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")
@@ -183,13 +200,47 @@ describe Gitlab::Client do
       @groups = Gitlab.group_search('Group')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/groups?search=Group")).to have_been_made
     end
 
-    it "should return an array of groups found" do
+    it "returns an array of groups found" do
       expect(@groups.first.id).to eq(5)
       expect(@groups.last.id).to eq(8)
     end
   end
+
+  describe ".group_subgroups" do
+    before do
+      stub_get("/groups/4/subgroups", "group_subgroups")
+      @subgroups = Gitlab.group_subgroups(4)
+    end
+
+    it "gets the list of subroups" do
+      expect(a_get("/groups/4/subgroups")).to have_been_made
+    end
+
+    it "returns an array of subgroups under a group" do
+      expect(@subgroups).to be_a Gitlab::PaginatedResponse
+      expect(@subgroups.size).to eq(1)
+      expect(@subgroups[0].name).to eq("Foobar Group")
+    end
+  end
+
+  describe ".edit_group" do
+    context "using group ID" do
+      before do
+        stub_put("/groups/1", "group_edit").with(body: { description: "An interesting group" })
+        @edited_project = Gitlab.edit_group(1, description: "An interesting group")
+      end
+
+      it "gets the correct resource" do
+        expect(a_put("/groups/1").with(body: { description: "An interesting group" })).to have_been_made
+      end
+
+      it "returns information about an edited group" do
+        expect(@edited_project.description).to eq("An interesting group")
+      end
+    end
+  end
 end