gitlab 3.2.0 → 3.3.0

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 an array of project's labels" do
+      expect(@labels).to be_an Array
+      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

data/spec/gitlab/client/merge_requests_spec.rb

@@ -35,7 +35,7 @@ describe Gitlab::Client do
 
   describe ".create_merge_request" do
     before do
-      stub_post("/projects/3/merge_requests", "create_merge_request")
+      stub_post("/projects/3/merge_requests", "merge_request")
     end
 
     it "should fail if it doesn't have a source_branch" do
@@ -57,13 +57,17 @@ describe Gitlab::Client do
       )
       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
 
   describe ".update_merge_request" do
     before do
-      stub_put("/projects/3/merge_request/2", "update_merge_request")
+      stub_put("/projects/3/merge_request/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',
@@ -71,26 +75,36 @@ describe Gitlab::Client do
       )
     end
 
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/merge_request/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
       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
+  describe ".accept_merge_request" do
     before do
-      stub_get("/projects/3/merge_request/2/comments", "merge_request_comments")
-      @merge_request = Gitlab.merge_request_comments(3, 2)
+      stub_put("/projects/5/merge_request/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 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)
+    it "should get the correct resource" do
+      expect(a_put("/projects/5/merge_request/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
 
@@ -100,6 +114,10 @@ describe Gitlab::Client do
       @merge_request = Gitlab.merge_request_comments(3, 2)
     end
 
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/merge_request/2/comments")).to have_been_made
+    end
+
     it "should return merge request's comments" do
       expect(@merge_request).to be_an Array
       expect(@merge_request.length).to eq(2)
@@ -112,13 +130,17 @@ describe Gitlab::Client do
 
   describe ".create_merge_request_comment" do
     before do
-      stub_post("/projects/3/merge_request/2/comments", "comment_merge_request")
+      stub_post("/projects/3/merge_request/2/comments", "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_request/2/comments")).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!')
       expect(@merge_request.note).to eq('Cool Merge Request!')
-      @merge_request.author.id == 1
+      expect(@merge_request.author.id).to eq(1)
     end
   end
 end

data/spec/gitlab/client/projects_spec.rb

@@ -342,7 +342,7 @@ describe Gitlab::Client do
 
   describe ".delete_deploy_key" do
     before do
-      stub_delete("/projects/42/keys/2", "project_delete_key")
+      stub_delete("/projects/42/keys/2", "project_key")
       @deploy_key = Gitlab.delete_deploy_key(42, 2)
     end
 

data/spec/gitlab/client/repositories_spec.rb

@@ -8,6 +8,10 @@ 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_tree }
+  it { should respond_to :repo_compare}
 
   describe ".tags" do
     before do
@@ -25,18 +29,68 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".file_contents" do
+    before do
+      stub_get("/projects/3/repository/blobs/master?filepath=Gemfile", "raw_file")
+      @file_contents = Gitlab.file_contents(3, "Gemfile")
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/blobs/master?filepath=Gemfile")).to have_been_made
+    end
+
+    it "should return file contents" do
+      expect(@file_contents).to eq("source 'https://rubygems.org'\ngem 'rails', '4.1.2'\n")
+    end
+  end
+
   describe ".create_tag" do
+    context "when lightweight" do
+      before do
+        stub_post("/projects/3/repository/tags", "project_tag_lightweight")
+        @tag = Gitlab.create_tag(3, 'v1.0.0', '2695effb5807a22ff3d138d593fd856244e155e7')
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/repository/tags")).to have_been_made
+      end
+
+      it "should return information about a new repository tag" do
+        expect(@tag.name).to eq("v1.0.0")
+        expect(@tag.message).to eq(nil)
+      end
+    end
+
+    context "when annotated" do
+      before do
+        stub_post("/projects/3/repository/tags", "project_tag_annotated")
+        @tag = Gitlab.create_tag(3, 'v1.1.0', '2695effb5807a22ff3d138d593fd856244e155e7', 'Release 1.1.0')
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/repository/tags")).to have_been_made
+      end
+
+      it "should return information about a new repository tag" do
+        expect(@tag.name).to eq("v1.1.0")
+        expect(@tag.message).to eq("Release 1.1.0")
+      end
+    end
+  end
+
+  describe ".tree" do
     before do
-      stub_post("/projects/3/repository/tags", "tag")
-      @tag = Gitlab.create_tag(3, 'v1.0.0', '2695effb5807a22ff3d138d593fd856244e155e7')
+      stub_get("/projects/3/repository/tree", "tree")
+      @tree = Gitlab.tree(3)
     end
 
     it "should get the correct resource" do
-      expect(a_post("/projects/3/repository/tags")).to have_been_made
+      expect(a_get("/projects/3/repository/tree")).to have_been_made
     end
 
-    it "should return information about a new repository tag" do
-      expect(@tag.name).to eq("v1.0.0")
+    it "should return an array of repository tree files (root level)" do
+      expect(@tree).to be_an Array
+      expect(@tree.first.name).to eq("app")
     end
   end
 
@@ -89,4 +143,55 @@ describe Gitlab::Client 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").
+        with(:query => {:from => "master", :to => "feature"})
+      @diff = Gitlab.compare(3, 'master', 'feature')
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/compare").
+        with(:query => {:from => "master", :to => "feature"})).to have_been_made
+    end
+
+    it "should get diffs of a merge request" do
+      expect(@diff.diffs).to be_kind_of Array
+      expect(@diff.diffs.last["new_path"]).to eq "files/js/application.js"
+    end
+  end
 end

data/spec/gitlab/client/system_hooks_spec.rb

@@ -39,16 +39,16 @@ describe Gitlab::Client do
 
   describe ".hook" do
     before do
-      stub_get("/hooks/3", "system_hook_test")
+      stub_get("/hooks/3", "system_hook")
       @hook = Gitlab.hook(3)
     end
+
     it "should get the correct resource" do
       expect(a_get("/hooks/3")).to have_been_made
     end
 
     it "should return information about a added system hook" do
-      expect(@hook.event_name).to eq("project_create")
-      expect(@hook.project_id).to eq(1)
+      expect(@hook.url).to eq("http://example.com/hook")
     end
   end
 

data/spec/gitlab/objectified_hash_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::ObjectifiedHash do
   before do
-    @hash = {a: 1, b: 2}
+    @hash = {a: 1, b: 2, 'string' => 'string', symbol: :symbol}
     @oh = Gitlab::ObjectifiedHash.new @hash
   end
 
@@ -20,4 +20,22 @@ describe Gitlab::ObjectifiedHash do
       expect(@oh.respond_to?(:to_h)).to be_truthy
     end
   end
+
+  describe "#respond_to" do
+    it "should return true for methods this object responds to through method_missing as sym" do
+      expect(@oh.respond_to?(:a)).to be_truthy
+    end
+
+    it "should return true for methods this object responds to through method_missing as string" do
+      expect(@oh.respond_to?('string')).to be_truthy
+    end
+
+    it "should not care if you use a string or symbol to reference a method" do
+      expect(@oh.respond_to?(:string)).to be_truthy
+    end
+
+    it "should not care if you use a string or symbol to reference a method" do
+      expect(@oh.respond_to?('symbol')).to be_truthy
+    end
+  end
 end

data/spec/gitlab/request_spec.rb

@@ -34,9 +34,10 @@ describe Gitlab::Request do
     end
 
     context "when endpoint is set" do
-      it "should set base_uri" do
-        Gitlab::Request.new.set_request_defaults('http://rabbit-hole.example.org', 1234000)
-        expect(Gitlab::Request.base_uri).to eq("http://rabbit-hole.example.org")
+      it "should set instance variable 'endpoint'" do
+        request = Gitlab::Request.new
+        request.set_request_defaults('http://rabbit-hole.example.org', 1234000)
+        expect(request.instance_variable_get(:@endpoint)).to eq("http://rabbit-hole.example.org")
       end
 
       it "should set default_params" do

data/spec/gitlab/shell_history_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe Gitlab::Shell::History do
+  context 'saving to a file' do
+    before do
+      @file = Tempfile.new('.gitlab_shell_history')
+      @history = Gitlab::Shell::History.new(file_path: @file.path)
+    end
+
+    after do @file.close(true) end
+
+    it 'saves the lines' do
+      @history << 'party on, dudes'
+      @history << 'be excellent to each other'
+      @history.save
+      expect(File.read @file.path).
+        to eq("party on, dudes\nbe excellent to each other\n")
+    end
+
+    it 'has the lines' do
+      @history << 'party on, dudes'
+      @history << 'be excellent to each other'
+      expect(@history.lines).
+        to eq(["party on, dudes", "be excellent to each other"])
+    end
+
+    it 'limits the lines to GITLAB_HISTFILESIZE' do
+      ENV['GITLAB_HISTFILESIZE'] = '2'
+      @history << 'bogus'
+      @history << 'party on, dudes'
+      @history << 'be excellent to each other'
+      @history.save
+      expect(@history.lines).
+        to eq(["party on, dudes", "be excellent to each other"])
+      expect(File.read @file.path).
+        to eq("party on, dudes\nbe excellent to each other\n")
+    end
+  end
+
+  context 'loading a file' do
+    before do
+      @file = load_fixture('shell_history')
+      @history = Gitlab::Shell::History.new(file_path: @file.path)
+    end
+
+    it 'has the lines' do
+      @history.load
+      expect(@history.lines).
+        to eq(["party on, dudes", "be excellent to each other"])
+    end
+  end
+end

data/spec/gitlab_spec.rb

@@ -7,6 +7,15 @@ describe Gitlab do
     it "should be a Gitlab::Client" do
       expect(Gitlab.client).to be_a Gitlab::Client
     end
+
+    it "should not override each other" do
+      client1 = Gitlab.client(endpoint: 'https://api1.example.com', private_token: '001')
+      client2 = Gitlab.client(endpoint: 'https://api2.example.com', private_token: '002')
+      expect(client1.endpoint).to eq('https://api1.example.com')
+      expect(client2.endpoint).to eq('https://api2.example.com')
+      expect(client1.private_token).to eq('001')
+      expect(client2.private_token).to eq('002')
+    end
   end
 
   describe ".actions" do
@@ -14,7 +23,7 @@ describe Gitlab do
       actions = Gitlab.actions
       expect(actions).to be_an Array
       expect(actions.first).to be_a Symbol
-      expect(actions.sort.first).to match(/add_/)
+      expect(actions.sort.first).to eq(:accept_merge_request)
     end
   end
 
@@ -62,4 +71,15 @@ describe Gitlab do
       end
     end
   end
+
+  describe ".http_proxy" do
+    it "delegates the method to Gitlab::Request" do
+      Gitlab.endpoint = 'https://api.example.com'
+      request = class_spy(Gitlab::Request).as_stubbed_const
+
+      Gitlab.http_proxy('fazbearentertainment.com', 1987, 'ffazbear', 'itsme')
+      expect(request).to have_received(:http_proxy).
+        with('fazbearentertainment.com', 1987, 'ffazbear', 'itsme')
+    end
+  end
 end