gitlab 3.5.0 → 3.6.0

data/spec/gitlab/client/namespaces_spec.rb

@@ -13,8 +13,8 @@ describe Gitlab::Client do
       expect(a_get("/namespaces")).to have_been_made
     end
 
-    it "should return an array of namespaces" do
-      expect(@namespaces).to be_an Array
+    it "should return a paginated response of namespaces" do
+      expect(@namespaces).to be_a Gitlab::PaginatedResponse
       expect(@namespaces.first.path).to eq("john")
       expect(@namespaces.first.kind).to eq("user")
     end

data/spec/gitlab/client/notes_spec.rb

@@ -12,8 +12,8 @@ describe Gitlab::Client do
         expect(a_get("/projects/3/notes")).to have_been_made
       end
 
-      it "should return an array of notes" do
-        expect(@notes).to be_an Array
+      it "should return a paginated response of notes" do
+        expect(@notes).to be_a Gitlab::PaginatedResponse
         expect(@notes.first.author.name).to eq("John Smith")
       end
     end
@@ -28,8 +28,8 @@ describe Gitlab::Client do
         expect(a_get("/projects/3/issues/7/notes")).to have_been_made
       end
 
-      it "should return an array of notes" do
-        expect(@notes).to be_an Array
+      it "should return a paginated response of notes" do
+        expect(@notes).to be_a Gitlab::PaginatedResponse
         expect(@notes.first.author.name).to eq("John Smith")
       end
     end
@@ -44,8 +44,8 @@ describe Gitlab::Client do
         expect(a_get("/projects/3/snippets/7/notes")).to have_been_made
       end
 
-      it "should return an array of notes" do
-        expect(@notes).to be_an Array
+      it "should return a paginated response of notes" do
+        expect(@notes).to be_a Gitlab::PaginatedResponse
         expect(@notes.first.author.name).to eq("John Smith")
       end
     end
@@ -110,7 +110,7 @@ describe Gitlab::Client do
 
       it "should get the correct resource" do
         expect(a_post("/projects/3/notes").
-          with(:body => {:body => 'The solution is rather tricky'})).to have_been_made
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
       it "should return information about a created note" do
@@ -127,7 +127,7 @@ describe Gitlab::Client do
 
       it "should get the correct resource" do
         expect(a_post("/projects/3/issues/7/notes").
-          with(:body => {:body => 'The solution is rather tricky'})).to have_been_made
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
       it "should return information about a created note" do
@@ -144,7 +144,7 @@ describe Gitlab::Client do
 
       it "should get the correct resource" do
         expect(a_post("/projects/3/snippets/7/notes").
-          with(:body => {:body => 'The solution is rather tricky'})).to have_been_made
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
       it "should return information about a created note" do
@@ -161,7 +161,7 @@ describe Gitlab::Client do
 
       it "should get the correct resource" do
         expect(a_post("/projects/3/merge_requests/7/notes").
-          with(:body => {:body => 'The solution is rather tricky'})).to have_been_made
+          with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
       it "should return information about a created note" do

data/spec/gitlab/client/projects_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Gitlab::Client do
+  it { should respond_to :search_projects }
+
   describe ".projects" do
     before do
       stub_get("/projects", "projects")
@@ -11,8 +13,8 @@ describe Gitlab::Client do
       expect(a_get("/projects")).to have_been_made
     end
 
-    it "should return an array of projects" do
-      expect(@projects).to be_an Array
+    it "should return a paginated response of projects" do
+      expect(@projects).to be_a Gitlab::PaginatedResponse
       expect(@projects.first.name).to eq("Brute")
       expect(@projects.first.owner.name).to eq("John Smith")
     end
@@ -28,12 +30,11 @@ describe Gitlab::Client do
       expect(a_get("/projects/search/Gitlab")).to have_been_made
     end
 
-    it "should return an array of projects found" do
-      expect(@project_search).to be_an Array
+    it "should return a paginated response of projects found" do
+      expect(@project_search).to be_a Gitlab::PaginatedResponse
       expect(@project_search.first.name).to eq("Gitlab")
       expect(@project_search.first.owner.name).to eq("John Smith")
     end
-
   end
 
   describe ".project" do
@@ -62,8 +63,8 @@ describe Gitlab::Client do
       expect(a_get("/projects/2/events")).to have_been_made
     end
 
-    it "should return an array of events" do
-      expect(@events).to be_an Array
+    it "should return a paginated response of events" do
+      expect(@events).to be_a Gitlab::PaginatedResponse
       expect(@events.size).to eq(2)
     end
 
@@ -91,9 +92,9 @@ describe Gitlab::Client do
   describe ".create_project for user" do
     before do
       stub_post("/users", "user")
-      @owner = Gitlab.create_user("john@example.com", "pass", {name: 'John Owner'})
+      @owner = Gitlab.create_user("john@example.com", "pass", name: 'John Owner')
       stub_post("/projects/user/#{@owner.id}", "project_for_user")
-      @project = Gitlab.create_project('Brute', {:user_id => @owner.id})
+      @project = Gitlab.create_project('Brute', user_id: @owner.id)
     end
 
     it "should return information about a created project" do
@@ -139,7 +140,7 @@ describe Gitlab::Client do
       before do
         stub_post("/projects/fork/3", "project_forked_for_user")
         @sudoed_username = 'jack.smith'
-        @project = Gitlab.create_fork(3, {sudo: @sudoed_username})
+        @project = Gitlab.create_fork(3, sudo: @sudoed_username)
       end
 
       it "should post to the correct resource" do
@@ -164,8 +165,8 @@ describe Gitlab::Client do
       expect(a_get("/projects/3/members")).to have_been_made
     end
 
-    it "should return an array of team members" do
-      expect(@team_members).to be_an Array
+    it "should return a paginated response of team members" do
+      expect(@team_members).to be_a Gitlab::PaginatedResponse
       expect(@team_members.first.name).to eq("John Smith")
     end
   end
@@ -193,7 +194,7 @@ describe Gitlab::Client do
 
     it "should get the correct resource" do
       expect(a_post("/projects/3/members").
-          with(:body => {:user_id => '1', :access_level => '40'})).to have_been_made
+          with(body: { user_id: '1', access_level: '40' })).to have_been_made
     end
 
     it "should return information about an added team member" do
@@ -209,7 +210,7 @@ describe Gitlab::Client do
 
     it "should get the correct resource" do
       expect(a_put("/projects/3/members/1").
-          with(:body => {:access_level => '40'})).to have_been_made
+          with(body: { access_level: '40' })).to have_been_made
     end
 
     it "should return information about an edited team member" do
@@ -242,8 +243,8 @@ describe Gitlab::Client do
       expect(a_get("/projects/1/hooks")).to have_been_made
     end
 
-    it "should return an array of hooks" do
-      expect(@hooks).to be_an Array
+    it "should return a paginated response of hooks" do
+      expect(@hooks).to be_a Gitlab::PaginatedResponse
       expect(@hooks.first.url).to eq("https://api.example.net/v1/webhooks/ci")
     end
   end
@@ -271,8 +272,8 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        body = {:url => "https://api.example.net/v1/webhooks/ci"}
-        expect(a_post("/projects/1/hooks").with(:body => body)).to have_been_made
+        body = { url: "https://api.example.net/v1/webhooks/ci" }
+        expect(a_post("/projects/1/hooks").with(body: body)).to have_been_made
       end
 
       it "should return information about an added hook" do
@@ -287,8 +288,8 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        body = {:url => "https://api.example.net/v1/webhooks/ci", push_events: "true", merge_requests_events: "true"}
-        expect(a_post("/projects/1/hooks").with(:body => body)).to have_been_made
+        body = { url: "https://api.example.net/v1/webhooks/ci", push_events: "true", merge_requests_events: "true" }
+        expect(a_post("/projects/1/hooks").with(body: body)).to have_been_made
       end
 
       it "should return information about an added hook" do
@@ -304,8 +305,8 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      body = {:url => "https://api.example.net/v1/webhooks/ci"}
-      expect(a_put("/projects/1/hooks/1").with(:body => body)).to have_been_made
+      body = { url: "https://api.example.net/v1/webhooks/ci" }
+      expect(a_put("/projects/1/hooks/1").with(body: body)).to have_been_made
     end
 
     it "should return information about an edited hook" do
@@ -315,12 +316,12 @@ describe Gitlab::Client do
 
   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")
+      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
+      expect(a_put("/projects/3").with(query: { name: "Gitlab-edit" })).to have_been_made
     end
 
     it "should return information about an edited project" do
@@ -332,8 +333,8 @@ describe Gitlab::Client do
     context "when empty response" do
       before do
         stub_request(:delete, "#{Gitlab.endpoint}/projects/1/hooks/1").
-          with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
-          to_return(:body => '')
+          with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token }).
+          to_return(body: '')
         @hook = Gitlab.delete_project_hook(1, 1)
       end
 
@@ -404,7 +405,7 @@ describe Gitlab::Client do
     end
 
     it "should return project deploy keys" do
-      expect(@deploy_keys).to be_an Array
+      expect(@deploy_keys).to be_a Gitlab::PaginatedResponse
       expect(@deploy_keys.first.id).to eq 2
       expect(@deploy_keys.first.title).to eq "Key Title"
       expect(@deploy_keys.first.key).to match(/ssh-rsa/)

data/spec/gitlab/client/repositories_spec.rb

@@ -6,7 +6,7 @@ describe Gitlab::Client do
   it { should respond_to :repo_branches }
   it { should respond_to :repo_branch }
   it { should respond_to :repo_tree }
-  it { should respond_to :repo_compare}
+  it { should respond_to :repo_compare }
 
   describe ".tags" do
     before do
@@ -18,8 +18,8 @@ describe Gitlab::Client do
       expect(a_get("/projects/3/repository/tags")).to have_been_made
     end
 
-    it "should return an array of repository tags" do
-      expect(@tags).to be_an Array
+    it "should return a paginated response of repository tags" do
+      expect(@tags).to be_a Gitlab::PaginatedResponse
       expect(@tags.first.name).to eq("v2.8.2")
     end
   end
@@ -83,8 +83,8 @@ describe Gitlab::Client do
       expect(a_get("/projects/3/repository/tree")).to have_been_made
     end
 
-    it "should return an array of repository tree files (root level)" do
-      expect(@tree).to be_an Array
+    it "should return a paginated response of repository tree files (root level)" do
+      expect(@tree).to be_a Gitlab::PaginatedResponse
       expect(@tree.first.name).to eq("app")
     end
   end
@@ -92,13 +92,13 @@ describe Gitlab::Client do
   describe ".compare" do
     before do
       stub_get("/projects/3/repository/compare", "compare_merge_request_diff").
-        with(:query => {:from => "master", :to => "feature"})
+        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
+        with(query: { from: "master", to: "feature" })).to have_been_made
     end
 
     it "should get diffs of a merge request" do

data/spec/gitlab/client/snippets_spec.rb

@@ -11,8 +11,8 @@ describe Gitlab::Client do
       expect(a_get("/projects/3/snippets")).to have_been_made
     end
 
-    it "should return an array of project's snippets" do
-      expect(@snippets).to be_an Array
+    it "should return a paginated response of project's snippets" do
+      expect(@snippets).to be_a Gitlab::PaginatedResponse
       expect(@snippets.first.file_name).to eq("mailer_test.rb")
     end
   end
@@ -36,12 +36,12 @@ describe Gitlab::Client do
   describe ".create_snippet" do
     before do
       stub_post("/projects/3/snippets", "snippet")
-      @snippet = Gitlab.create_snippet(3, {:title => 'API', :file_name => 'api.rb', :code => 'code'})
+      @snippet = Gitlab.create_snippet(3, title: 'API', file_name: 'api.rb', code: 'code')
     end
 
     it "should get the correct resource" do
-      body = {:title => 'API', :file_name => 'api.rb', :code => 'code'}
-      expect(a_post("/projects/3/snippets").with(:body => body)).to have_been_made
+      body = { title: 'API', file_name: 'api.rb', code: 'code' }
+      expect(a_post("/projects/3/snippets").with(body: body)).to have_been_made
     end
 
     it "should return information about a new snippet" do
@@ -53,12 +53,12 @@ describe Gitlab::Client do
   describe ".edit_snippet" do
     before do
       stub_put("/projects/3/snippets/1", "snippet")
-      @snippet = Gitlab.edit_snippet(3, 1, :file_name => 'mailer_test.rb')
+      @snippet = Gitlab.edit_snippet(3, 1, file_name: 'mailer_test.rb')
     end
 
     it "should get the correct resource" do
       expect(a_put("/projects/3/snippets/1").
-        with(:body => {:file_name => 'mailer_test.rb'})).to have_been_made
+        with(body: { file_name: 'mailer_test.rb' })).to have_been_made
     end
 
     it "should return information about an edited snippet" do

data/spec/gitlab/client/system_hooks_spec.rb

@@ -16,8 +16,8 @@ describe Gitlab::Client 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
+    it "should return a paginated response of system hooks" do
+      expect(@hooks).to be_a Gitlab::PaginatedResponse
       expect(@hooks.first.url).to eq("http://example.com/hook")
     end
   end

data/spec/gitlab/client/users_spec.rb

@@ -11,8 +11,8 @@ describe Gitlab::Client do
       expect(a_get("/users")).to have_been_made
     end
 
-    it "should return an array of users" do
-      expect(@users).to be_an Array
+    it "should return a paginated response of users" do
+      expect(@users).to be_a Gitlab::PaginatedResponse
       expect(@users.first.email).to eq("john@example.com")
     end
   end
@@ -57,8 +57,8 @@ describe Gitlab::Client do
       end
 
       it "should get the correct resource" do
-        body = {:email => "email", :password => "pass", :name => "email"}
-        expect(a_post("/users").with(:body => body)).to have_been_made
+        body = { email: "email", password: "pass", name: "email" }
+        expect(a_post("/users").with(body: body)).to have_been_made
       end
 
       it "should return information about a created user" do
@@ -69,9 +69,9 @@ describe Gitlab::Client do
     context "when bad request" do
       it "should throw an exception" do
         stub_post("/users", "error_already_exists", 409)
-        expect {
+        expect do
           Gitlab.create_user("email", "pass")
-        }.to raise_error(Gitlab::Error::Conflict, "Server responded with code 409, message: 409 Already exists. Request URI: #{Gitlab.endpoint}/users")
+        end.to raise_error(Gitlab::Error::Conflict, "Server responded with code 409, message: 409 Already exists. Request URI: #{Gitlab.endpoint}/users")
       end
     end
   end
@@ -84,8 +84,8 @@ describe Gitlab::Client do
       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
+        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
@@ -96,22 +96,22 @@ describe Gitlab::Client do
     context "when bad request" do
       it "should throw an exception" do
         stub_post("/users", "error_already_exists", 409)
-        expect {
+        expect do
           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.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" }
-      stub_put("/users/1", "user").with(:body => @options)
+      @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
+      expect(a_put("/users/1").with(body: @options)).to have_been_made
     end
   end
 
@@ -168,16 +168,16 @@ describe Gitlab::Client do
 
     before do
       stub_request(:post, "#{Gitlab.endpoint}/session").
-        to_return(:body => load_fixture('session'), :status => 200)
+        to_return(body: load_fixture('session'), status: 200)
       @session = Gitlab.session("email", "pass")
     end
 
     context "when endpoint is not set" do
       it "should raise Error::MissingCredentials" do
         Gitlab.endpoint = nil
-        expect {
+        expect do
           Gitlab.session("email", "pass")
-        }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
+        end.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
       end
     end
 
@@ -210,8 +210,8 @@ describe Gitlab::Client do
       expect(a_get("/user/keys")).to have_been_made
     end
 
-    it "should return an array of SSH keys" do
-      expect(@keys).to be_an Array
+    it "should return a paginated response of SSH keys" do
+      expect(@keys).to be_a Gitlab::PaginatedResponse
       expect(@keys.first.title).to eq("narkoz@helium")
     end
   end
@@ -238,8 +238,8 @@ describe Gitlab::Client do
     end
 
     it "should get the correct resource" do
-      body = {:title => "title", :key => "body"}
-      expect(a_post("/user/keys").with(:body => body)).to have_been_made
+      body = { title: "title", key: "body" }
+      expect(a_post("/user/keys").with(body: body)).to have_been_made
     end
 
     it "should return information about a created SSH key" do
@@ -261,5 +261,4 @@ describe Gitlab::Client do
       expect(@key.title).to eq("narkoz@helium")
     end
   end
-
 end