gitlab 3.4.0 → 3.5.0

data/spec/gitlab/client/groups_spec.rb

@@ -21,19 +21,40 @@ describe Gitlab::Client do
   end
 
   describe ".create_group" 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")
+    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
 
@@ -108,4 +129,21 @@ describe Gitlab::Client do
   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/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 an array of namespaces" do
+      expect(@namespaces).to be_an Array
+      expect(@namespaces.first.path).to eq("john")
+      expect(@namespaces.first.kind).to eq("user")
+    end
+  end
+end

data/spec/gitlab/client/projects_spec.rb

@@ -118,6 +118,42 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".create_fork" do
+    context "without sudo option" do
+      before do
+        stub_post("/projects/fork/3", "project_fork")
+        @project = Gitlab.create_fork(3)
+      end
+
+      it "should post to the correct resource" do
+        expect(a_post("/projects/fork/3")).to have_been_made
+      end
+
+      it "should return information about the forked project" do
+        expect(@project.forked_from_project.id).to eq(3)
+        expect(@project.id).to eq(20)
+      end
+    end
+
+    context "with the sudo option" do
+      before do
+        stub_post("/projects/fork/3", "project_forked_for_user")
+        @sudoed_username = 'jack.smith'
+        @project = Gitlab.create_fork(3, {sudo: @sudoed_username})
+      end
+
+      it "should post to the correct resource" do
+        expect(a_post("/projects/fork/3")).to have_been_made
+      end
+
+      it "should return information about the forked project" do
+        expect(@project.forked_from_project.id).to eq(3)
+        expect(@project.id).to eq(20)
+        expect(@project.owner.username).to eq(@sudoed_username)
+      end
+    end
+  end
+
   describe ".team_members" do
     before do
       stub_get("/projects/3/members", "team_members")
@@ -277,6 +313,21 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".edit_project" do
+    before do
+      stub_put("/projects/3", "project_edit").with(:query => { :name => "Gitlab-edit" })
+      @edited_project =  Gitlab.edit_project(3, :name => "Gitlab-edit")
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3").with(:query => { :name => "Gitlab-edit" })).to have_been_made
+    end
+
+    it "should return information about an edited project" do
+      expect(@edited_project.name).to eq("Gitlab-edit")
+    end
+  end
+
   describe ".delete_project_hook" do
     context "when empty response" do
       before do

data/spec/gitlab/client/repositories_spec.rb

@@ -5,11 +5,6 @@ describe Gitlab::Client do
   it { should respond_to :repo_create_tag }
   it { should respond_to :repo_branches }
   it { should respond_to :repo_branch }
-  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_tree }
   it { should respond_to :repo_compare}
 
@@ -94,89 +89,6 @@ describe Gitlab::Client do
     end
   end
 
-  describe ".commits" do
-    before do
-      stub_get("/projects/3/repository/commits", "project_commits").
-        with(:query => {:ref_name => "api"})
-      @commits = Gitlab.commits(3, :ref_name => "api")
-    end
-
-    it "should get the correct resource" do
-      expect(a_get("/projects/3/repository/commits").
-        with(:query => {:ref_name => "api"})).to have_been_made
-    end
-
-    it "should return an array of repository commits" do
-      expect(@commits).to be_an Array
-      expect(@commits.first.id).to eq("f7dd067490fe57505f7226c3b54d3127d2f7fd46")
-    end
-  end
-
-  describe ".commit" do
-    before do
-      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6", "project_commit")
-      @commit = Gitlab.commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
-    end
-
-    it "should get the correct resource" do
-      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6"))
-        .to have_been_made
-    end
-
-    it "should return a repository commit" do
-      expect(@commit.id).to eq("6104942438c14ec7bd21c6cd5bd995272b3faff6")
-    end
-  end
-
-  describe ".commit_diff" do
-    before do
-      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/diff", "project_commit_diff")
-      @diff = Gitlab.commit_diff(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
-    end
-
-    it "should get 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
-      expect(@diff.new_path).to eq("doc/update/5.4-to-6.0.md")
-    end
-  end
-
-  describe ".commit_comments" do
-    before do
-      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/comments", "project_commit_comments")
-      @commit_comments = Gitlab.commit_comments(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
-    end
-
-    it "should get 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
-      expect(@commit_comments).to be_an Array
-      expect(@commit_comments.length).to eq(2)
-      expect(@commit_comments[0].note).to eq("this is the 1st comment on commit 6104942438c14ec7bd21c6cd5bd995272b3faff6")
-      expect(@commit_comments[0].author.id).to eq(11)
-      expect(@commit_comments[1].note).to eq("another discussion point on commit 6104942438c14ec7bd21c6cd5bd995272b3faff6")
-      expect(@commit_comments[1].author.id).to eq(12)
-    end
-  end
-
-  describe ".create_commit_comment" do
-    before do
-      stub_post("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/comments", "project_commit_comment")
-      @merge_request = Gitlab.create_commit_comment(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'Nice code!')
-    end
-
-    it "should return information about the newly created comment" do
-      expect(@merge_request.note).to eq('Nice code!')
-      expect(@merge_request.author.id).to eq(1)
-    end
-  end
-
   describe ".compare" do
     before do
       stub_get("/projects/3/repository/compare", "compare_merge_request_diff").

data/spec/gitlab/client/repository_files_spec.rb

@@ -1,6 +1,23 @@
 require "spec_helper"
 
 describe Gitlab::Client do
+  describe ".get_file" do
+    before do
+      stub_get("/projects/3/repository/files?file_path=README.md&ref=master", "get_repository_file")
+      @file = Gitlab.get_file(3, 'README.md', 'master')
+    end
+
+    it "should create the correct resource" do
+      expect(a_get("/projects/3/repository/files?file_path=README.md&ref=master")).to have_been_made
+    end
+
+    it "should return the base64 encoded file" do
+      expect(@file.file_path).to eq "README.md"
+      expect(@file.ref).to eq "master"
+      expect(@file.content).to eq "VGhpcyBpcyBhICpSRUFETUUqIQ==\n"
+    end
+  end
+
   describe ".create_file" do
     let!(:request_stub) { stub_post("/projects/3/repository/files", "repository_file") }
     let!(:file) { Gitlab.create_file(3, "path", "branch", "content", "commit message") }

data/spec/gitlab/client/snippets_spec.rb

@@ -82,4 +82,19 @@ describe Gitlab::Client do
       expect(@snippet.author.name).to eq("John Smith")
     end
   end
+
+  describe ".snippet_content" do
+    before do
+      stub_get("/projects/3/snippets/1/raw", "snippet_content")
+      @snippet_content = Gitlab.snippet_content(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/snippets/1/raw")).to have_been_made
+    end
+
+    it "should return raw content of a snippet" do
+      expect(@snippet_content).to eq("#!/usr/bin/env ruby\n\nputs \"Cool snippet!\"\n")
+    end
+  end
 end

data/spec/gitlab/client/users_spec.rb

@@ -76,6 +76,33 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".create_user_with_userame" do
+    context "when successful request" do
+      before do
+        stub_post("/users", "user")
+        @user = Gitlab.create_user("email", "pass", "username")
+      end
+
+      it "should get the correct resource" do
+        body = {:email => "email", :password => "pass", :username => "username"}
+        expect(a_post("/users").with(:body => body)).to have_been_made
+      end
+
+      it "should return information about a created user" do
+        expect(@user.email).to eq("john@example.com")
+      end
+    end
+
+    context "when bad request" do
+      it "should throw an exception" do
+        stub_post("/users", "error_already_exists", 409)
+        expect {
+          Gitlab.create_user("email", "pass", "username")
+        }.to raise_error(Gitlab::Error::Conflict, "Server responded with code 409, message: 409 Already exists. Request URI: #{Gitlab.endpoint}/users")
+      end
+    end
+  end
+
   describe ".edit_user" do
     before do
       @options = { :name => "Roberto" }
@@ -88,6 +115,51 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".delete_user" do
+    before do
+      stub_delete("/users/1", "user")
+      @user = Gitlab.delete_user(1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/users/1")).to have_been_made
+    end
+
+    it "should return information about a deleted user" do
+      expect(@user.email).to eq("john@example.com")
+    end
+  end
+
+  describe ".block_user" do
+    before do
+      stub_put("/users/1/block", "user_block_unblock")
+      @result = Gitlab.block_user(1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/users/1/block")).to have_been_made
+    end
+
+    it "should return boolean" do
+      expect(@result).to eq(true)
+    end
+  end
+
+  describe ".unblock_user" do
+    before do
+      stub_put("/users/1/unblock", "user_block_unblock")
+      @result = Gitlab.unblock_user(1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/users/1/unblock")).to have_been_made
+    end
+
+    it "should return boolean" do
+      expect(@result).to eq(true)
+    end
+  end
+
   describe ".session" do
     after do
       Gitlab.endpoint = 'https://api.example.com'
@@ -189,4 +261,5 @@ describe Gitlab::Client do
       expect(@key.title).to eq("narkoz@helium")
     end
   end
+
 end

data/spec/gitlab/help_spec.rb

@@ -13,7 +13,7 @@ describe Gitlab::Help do
     context "ri command NOT found" do
       it "should raise" do
         allow(Gitlab::Help).to receive(:`).with(/which ri/).and_return('')
-        expect{Gitlab::Help.ri_cmd}.to raise_error
+        expect{Gitlab::Help.ri_cmd}.to raise_error RuntimeError
       end
     end
 

data/spec/gitlab/request_spec.rb

@@ -7,9 +7,6 @@ describe Gitlab::Request do
   it { should respond_to :delete }
   before do
     @request = Gitlab::Request.new
-    @obj_h = Gitlab::ObjectifiedHash.new({user: ['not set'],
-                                          password: ['too short'],
-                                          embed_entity: { foo: ['bar'], sna: ['fu'] }})
   end
 
   describe ".default_options" do
@@ -27,6 +24,10 @@ describe Gitlab::Request do
     it "should return ObjectifiedHash" do
       body = JSON.unparse({a: 1, b: 2})
       expect(Gitlab::Request.parse(body)).to be_an Gitlab::ObjectifiedHash
+      expect(Gitlab::Request.parse("true")).to be true
+      expect(Gitlab::Request.parse("false")).to be false
+
+      expect { Gitlab::Request.parse("string") }.to raise_error(Gitlab::Error::Parsing)
     end
   end
 
@@ -71,12 +72,24 @@ describe Gitlab::Request do
   end
 
   describe "#handle_error" do
+    before do
+      @array = Array.new(['First message.', 'Second message.'])
+      @obj_h = Gitlab::ObjectifiedHash.new({user: ['not set'],
+                                            password: ['too short'],
+                                            embed_entity: { foo: ['bar'], sna: ['fu'] }})
+    end
     context "when passed an ObjectifiedHash" do
       it "should return a joined string of error messages sorted by key" do
         expect(@request.send(:handle_error, @obj_h)).to eq("'embed_entity' (foo: bar) (sna: fu), 'password' too short, 'user' not set")
       end
     end
 
+    context "when passed an Array" do
+      it "should return a joined string of messages" do
+        expect(@request.send(:handle_error, @array)).to eq("First message. Second message.")
+      end
+    end
+
     context "when passed a String" do
       it "should return the String untouched" do
         error = 'this is an error string'