gitlab 3.0.0 → 3.1.0

data/spec/gitlab/client/repositories_spec.rb

@@ -5,6 +5,8 @@ describe Gitlab::Client do
   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 }
 
   describe ".tags" do
     before do
@@ -13,61 +15,62 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/repository/tags").should have_been_made
+      expect(a_get("/projects/3/repository/tags")).to have_been_made
     end
 
     it "should return an array of repository tags" do
-      @tags.should be_an Array
-      @tags.first.name.should == "v2.8.2"
+      expect(@tags).to be_an Array
+      expect(@tags.first.name).to eq("v2.8.2")
     end
   end
 
-  describe ".branches" do
+  describe ".commits" do
     before do
-      stub_get("/projects/3/repository/branches", "project_branches")
-      @branches = Gitlab.branches(3)
+      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
-      a_get("/projects/3/repository/branches").should have_been_made
+      expect(a_get("/projects/3/repository/commits").
+        with(:query => {:ref_name => "api"})).to have_been_made
     end
 
-    it "should return an array of repository branches" do
-      @branches.should be_an Array
-      @branches.first.name.should == "api"
+    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 ".branch" do
+  describe ".commit" do
     before do
-      stub_get("/projects/3/repository/branches/api", "project_branch")
-      @branch = Gitlab.branch(3, "api")
+      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6", "project_commit")
+      @commit = Gitlab.commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/repository/branches/api").should have_been_made
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6"))
+        .to have_been_made
     end
 
-    it "should return information about a repository branch" do
-      @branch.name.should == "api"
+    it "should return a repository commit" do
+      expect(@commit.id).to eq("6104942438c14ec7bd21c6cd5bd995272b3faff6")
     end
   end
 
-  describe ".commits" do
+  describe ".commit_diff" do
     before do
-      stub_get("/projects/3/repository/commits", "project_commits").
-        with(:query => {:ref_name => "api"})
-      @commits = Gitlab.commits(3, :ref_name => "api")
+      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
-      a_get("/projects/3/repository/commits").
-        with(:query => {:ref_name => "api"}).should have_been_made
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/diff"))
+        .to have_been_made
     end
 
-    it "should return an array of repository commits" do
-      @commits.should be_an Array
-      @commits.first.id.should == "f7dd067490fe57505f7226c3b54d3127d2f7fd46"
+    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
 end

data/spec/gitlab/client/snippets_spec.rb

@@ -8,12 +8,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/snippets").should have_been_made
+      expect(a_get("/projects/3/snippets")).to have_been_made
     end
 
     it "should return an array of project's snippets" do
-      @snippets.should be_an Array
-      @snippets.first.file_name.should == "mailer_test.rb"
+      expect(@snippets).to be_an Array
+      expect(@snippets.first.file_name).to eq("mailer_test.rb")
     end
   end
 
@@ -24,12 +24,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/projects/3/snippets/1").should have_been_made
+      expect(a_get("/projects/3/snippets/1")).to have_been_made
     end
 
     it "should return information about a snippet" do
-      @snippet.file_name.should == "mailer_test.rb"
-      @snippet.author.name.should == "John Smith"
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
     end
   end
 
@@ -41,12 +41,12 @@ describe Gitlab::Client do
 
     it "should get the correct resource" do
       body = {:title => 'API', :file_name => 'api.rb', :code => 'code'}
-      a_post("/projects/3/snippets").with(:body => body).should have_been_made
+      expect(a_post("/projects/3/snippets").with(:body => body)).to have_been_made
     end
 
     it "should return information about a new snippet" do
-      @snippet.file_name.should == "mailer_test.rb"
-      @snippet.author.name.should == "John Smith"
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
     end
   end
 
@@ -57,13 +57,13 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_put("/projects/3/snippets/1").
-        with(:body => {:file_name => 'mailer_test.rb'}).should have_been_made
+      expect(a_put("/projects/3/snippets/1").
+        with(:body => {:file_name => 'mailer_test.rb'})).to have_been_made
     end
 
     it "should return information about an edited snippet" do
-      @snippet.file_name.should == "mailer_test.rb"
-      @snippet.author.name.should == "John Smith"
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
     end
   end
 
@@ -74,12 +74,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_delete("/projects/3/snippets/1").should have_been_made
+      expect(a_delete("/projects/3/snippets/1")).to have_been_made
     end
 
     it "should return information about a deleted snippet" do
-      @snippet.file_name.should == "mailer_test.rb"
-      @snippet.author.name.should == "John Smith"
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
     end
   end
 end

data/spec/gitlab/client/system_hooks_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :system_hooks }
+  it { should respond_to :add_system_hook }
+  it { should respond_to :system_hook }
+  it { should respond_to :delete_system_hook }
+
+  describe ".hooks" do
+    before do
+      stub_get("/hooks", "system_hooks")
+      @hooks = Gitlab.hooks
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/hooks")).to have_been_made
+    end
+
+    it "should return an array of system hooks" do
+      expect(@hooks).to be_an Array
+      expect(@hooks.first.url).to eq("http://example.com/hook")
+    end
+  end
+
+  describe ".add_hook" do
+    before do
+      stub_post("/hooks", "system_hook")
+      @hook = Gitlab.add_hook("http://example.com/hook")
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/hooks")).to have_been_made
+    end
+
+    it "should return information about a added system hook" do
+      expect(@hook.url).to eq("http://example.com/hook")
+    end
+  end
+
+  describe ".hook" do
+    before do
+      stub_get("/hooks/3", "system_hook_test")
+      @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)
+    end
+  end
+
+  describe ".delete_hook" do
+    before do
+      stub_delete("/hooks/3", "system_hook")
+      @hook = Gitlab.delete_hook(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/hooks/3")).to have_been_made
+    end
+
+    it "should return information about a deleted system hook" do
+      expect(@hook.url).to eq("http://example.com/hook")
+    end
+  end
+end

data/spec/gitlab/client/users_spec.rb

@@ -8,12 +8,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/users").should have_been_made
+      expect(a_get("/users")).to have_been_made
     end
 
     it "should return an array of users" do
-      @users.should be_an Array
-      @users.first.email.should == "john@example.com"
+      expect(@users).to be_an Array
+      expect(@users.first.email).to eq("john@example.com")
     end
   end
 
@@ -25,11 +25,11 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/users/1").should have_been_made
+        expect(a_get("/users/1")).to have_been_made
       end
 
       it "should return information about a user" do
-        @user.email.should == "john@example.com"
+        expect(@user.email).to eq("john@example.com")
       end
     end
 
@@ -40,11 +40,11 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        a_get("/user").should have_been_made
+        expect(a_get("/user")).to have_been_made
       end
 
       it "should return information about an authorized user" do
-        @user.email.should == "john@example.com"
+        expect(@user.email).to eq("john@example.com")
       end
     end
   end
@@ -58,11 +58,11 @@ describe Gitlab::Client do
 
       it "should get the correct resource" do
         body = {:email => "email", :password => "pass", :name => "email"}
-        a_post("/users").with(:body => body).should have_been_made
+        expect(a_post("/users").with(:body => body)).to have_been_made
       end
 
       it "should return information about a created user" do
-        @user.email.should == "john@example.com"
+        expect(@user.email).to eq("john@example.com")
       end
     end
 
@@ -76,19 +76,55 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".edit_user" do
+    before do
+      @options = { :name => "Roberto" }
+      stub_put("/users/1", "user").with(:body => @options)
+      @user = Gitlab.edit_user(1, @options)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/users/1").with(:body => @options)).to have_been_made
+    end
+  end
+
   describe ".session" do
+    after do
+      Gitlab.endpoint = 'https://api.example.com'
+      Gitlab.private_token = 'secret'
+    end
+
     before do
-      stub_post("/session", "session")
+      stub_request(:post, "#{Gitlab.endpoint}/session").
+        to_return(:body => load_fixture('session'), :status => 200)
       @session = Gitlab.session("email", "pass")
     end
 
-    it "should get the correct resource" do
-      a_post("/session").should have_been_made
+    context "when endpoint is not set" do
+      it "should raise Error::MissingCredentials" do
+        Gitlab.endpoint = nil
+        expect {
+          Gitlab.session("email", "pass")
+        }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
+      end
+    end
+
+    context "when private_token is not set" do
+      it "should not raise Error::MissingCredentials" do
+        Gitlab.private_token = nil
+        expect { Gitlab.session("email", "pass") }.to_not raise_error
+      end
     end
 
-    it "should return information about a created session" do
-      @session.email.should == "john@example.com"
-      @session.private_token.should == "qEsq1pt6HJPaNciie3MG"
+    context "when endpoint is set" do
+      it "should get the correct resource" do
+        expect(a_request(:post, "#{Gitlab.endpoint}/session")).to have_been_made
+      end
+
+      it "should return information about a created session" do
+        expect(@session.email).to eq("john@example.com")
+        expect(@session.private_token).to eq("qEsq1pt6HJPaNciie3MG")
+      end
     end
   end
 
@@ -99,12 +135,12 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/user/keys").should have_been_made
+      expect(a_get("/user/keys")).to have_been_made
     end
 
     it "should return an array of SSH keys" do
-      @keys.should be_an Array
-      @keys.first.title.should == "narkoz@helium"
+      expect(@keys).to be_an Array
+      expect(@keys.first.title).to eq("narkoz@helium")
     end
   end
 
@@ -115,11 +151,11 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_get("/user/keys/1").should have_been_made
+      expect(a_get("/user/keys/1")).to have_been_made
     end
 
     it "should return information about an SSH key" do
-      @key.title.should == "narkoz@helium"
+      expect(@key.title).to eq("narkoz@helium")
     end
   end
 
@@ -131,11 +167,11 @@ describe Gitlab::Client do
 
     it "should get the correct resource" do
       body = {:title => "title", :key => "body"}
-      a_post("/user/keys").with(:body => body).should have_been_made
+      expect(a_post("/user/keys").with(:body => body)).to have_been_made
     end
 
     it "should return information about a created SSH key" do
-      @key.title.should == "narkoz@helium"
+      expect(@key.title).to eq("narkoz@helium")
     end
   end
 
@@ -146,11 +182,11 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      a_delete("/user/keys/1").should have_been_made
+      expect(a_delete("/user/keys/1")).to have_been_made
     end
 
     it "should return information about a deleted SSH key" do
-      @key.title.should == "narkoz@helium"
+      expect(@key.title).to eq("narkoz@helium")
     end
   end
 end

data/spec/gitlab/objectified_hash_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Gitlab::ObjectifiedHash do
+  before do
+    @hash = {a: 1, b: 2}
+    @oh = Gitlab::ObjectifiedHash.new @hash
+  end
+
+  it "should objectify hash" do
+    expect(@oh.a).to eq(@hash[:a])
+    expect(@oh.b).to eq(@hash[:b])
+  end
+
+  describe "#to_hash" do
+    it "should return an original hash" do
+      expect(@oh.to_hash).to eq(@hash)
+    end
+
+    it "should have an alias #to_h" do
+      expect(@oh.respond_to?(:to_h)).to be_true
+    end
+  end
+end

data/spec/gitlab/request_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Gitlab::Request do
+  it { should respond_to :get }
+  it { should respond_to :post }
+  it { should respond_to :put }
+  it { should respond_to :delete }
+
+  describe ".default_options" do
+    it "should have default values" do
+      default_options = Gitlab::Request.default_options
+      expect(default_options).to be_a Hash
+      expect(default_options[:parser]).to be_a Proc
+      expect(default_options[:format]).to eq(:json)
+      expect(default_options[:headers]).to eq({'Accept' => 'application/json'})
+      expect(default_options[:default_params]).to be_nil
+    end
+  end
+
+  describe ".parse" do
+    it "should return ObjectifiedHash" do
+      body = JSON.unparse({a: 1, b: 2})
+      expect(Gitlab::Request.parse(body)).to be_an Gitlab::ObjectifiedHash
+    end
+  end
+
+  describe "#set_request_defaults" do
+    context "when endpoint is not set" do
+      it "should raise Error::MissingCredentials" do
+        expect {
+          Gitlab::Request.new.set_request_defaults(nil, 1234000)
+        }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
+      end
+    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")
+      end
+
+      it "should set default_params" do
+        Gitlab::Request.new.set_request_defaults('http://rabbit-hole.example.org', 1234000, 'sudoer')
+        expect(Gitlab::Request.default_params).to eq({:sudo => 'sudoer'})
+      end
+    end
+  end
+end