gitlab 4.2.0 → 4.3.0

data/spec/gitlab/client/pipeline_schedules_spec.rb

@@ -0,0 +1,158 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".pipeline_schedules" do
+    before do
+      stub_get("/projects/3/pipeline_schedules", "pipeline_schedules")
+      @pipeline_schedules = Gitlab.pipeline_schedules(3)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/pipeline_schedules")).to have_been_made
+    end
+
+    it "returns a response of project's pipeline schedules" do
+      expect(@pipeline_schedules).to be_a Gitlab::PaginatedResponse
+    end
+  end
+
+  describe ".pipeline_schedule" do
+    before do
+      stub_get("/projects/3/pipeline_schedules/5", "pipeline_schedule")
+      @pipeline_schedule = Gitlab.pipeline_schedule(3, 5)
+    end
+
+    it "gets the correct resource" do
+      expect(a_get("/projects/3/pipeline_schedules/5")).to have_been_made
+    end
+
+    it "returns a response of project's pipeline schedules" do
+      expect(@pipeline_schedule).to be_a Gitlab::ObjectifiedHash
+    end
+  end
+
+  describe ".create_pipeline_schedule" do
+    before do
+      stub_post("/projects/3/pipeline_schedules", "pipeline_schedule_create")
+      @pipeline_schedule_create = Gitlab.create_pipeline_schedule(3)
+    end
+
+    it "gets the correct resource" do
+      expect(a_post("/projects/3/pipeline_schedules")).to have_been_made
+    end
+
+    it "returns a single pipeline schedule" do
+      expect(@pipeline_schedule_create).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "returns information about a pipeline schedule" do
+      expect(@pipeline_schedule_create.owner.name).to eq("Administrator")
+    end
+  end
+
+  describe ".edit_pipeline_schedule" do
+    before do
+      stub_put("/projects/3/pipeline_schedules/13", "pipeline_schedule_update")
+      @pipeline_schedule_update = Gitlab.edit_pipeline_schedule(3, 13)
+    end
+
+    it "gets the correct resource" do
+      expect(a_put("/projects/3/pipeline_schedules/13")).to have_been_made
+    end
+
+    it "returns a single pipeline schedule" do
+      expect(@pipeline_schedule_update).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "returns information about a pipeline schedule" do
+      expect(@pipeline_schedule_update.owner.name).to eq("Administrator")
+    end
+  end
+
+  describe ".pipeline_schedule_take_ownership" do
+    before do
+      stub_post("/projects/3/pipeline_schedules/13/take_ownership", "pipeline_schedule")
+      @pipeline_schedule = Gitlab.pipeline_schedule_take_ownership(3, 13)
+    end
+
+    it "gets the correct resource" do
+      expect(a_post("/projects/3/pipeline_schedules/13/take_ownership")).to have_been_made
+    end
+
+    it "returns information about the pipeline schedule" do
+      expect(@pipeline_schedule.created_at).to eq("2017-05-19T13:31:08.849Z")
+      expect(@pipeline_schedule.description).to eq("Test schedule pipeline")
+    end
+  end
+
+  describe ".delete_pipeline_schedule" do
+    before do
+      stub_delete("/projects/3/pipeline_schedules/13", "pipeline_schedule")
+      @pipeline_schedule = Gitlab.delete_pipeline_schedule(3,13)
+    end
+
+    it "gets the correct resource" do
+      expect(a_delete("/projects/3/pipeline_schedules/13")).to have_been_made
+    end
+
+    it "returns a single pipeline" do
+      expect(@pipeline_schedule).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "returns information about the deleted pipeline" do
+      # expect(@pipeline_schedule.id).to eq(13)
+    end
+  end
+
+  describe ".create_pipeline_schedule_variable" do
+    before do
+      stub_post("/projects/3/pipeline_schedules/13/variables?key=NEW%20VARIABLE&value=new%20value", "pipeline_schedule_variable")
+      @pipeline_schedule_variable = Gitlab.create_pipeline_schedule_variable(3, 13, {
+        key: "NEW VARIABLE",
+        value: "new value"
+      })
+    end
+
+    it "gets the correct resource" do
+      expect(a_post("/projects/3/pipeline_schedules/13/variables?key=NEW%20VARIABLE&value=new%20value")).to have_been_made
+    end
+
+    it "returns a single variable" do
+      expect(@pipeline_schedule_variable).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "returns the created variable" do
+      expect(@pipeline_schedule_variable.value).to eq("new value")
+    end
+  end
+
+  describe ".edit_pipeline_schedule_variable" do
+    before do
+      stub_put("/projects/3/pipeline_schedules/13/variables/NEW%20VARIABLE?value=update%20value", "pipeline_schedule_variable_update")
+      @pipeline_schedule_variable = Gitlab.edit_pipeline_schedule_variable(3, 13, "NEW VARIABLE", { value: "update value" })
+    end
+
+    it "returns a single variable" do
+      expect(@pipeline_schedule_variable).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "has the updated value" do
+      expect(@pipeline_schedule_variable.value).to eq("update value")
+    end
+  end
+
+  describe ".delete_pipeline_schedule_variable" do
+    before do
+      stub_delete("/projects/3/pipeline_schedules/13/variables/NEW%20VARIABLE", "pipeline_schedule_variable")
+      @pipeline_schedule_variable = Gitlab.delete_pipeline_schedule_variable(3, 13, "NEW VARIABLE")
+    end
+
+    it "returns a single variable" do
+      expect(@pipeline_schedule_variable).to be_a Gitlab::ObjectifiedHash
+    end
+
+    it "has the value of the deleted variable" do
+      expect(@pipeline_schedule_variable.value).to eq("new value")
+    end
+  end
+end

data/spec/gitlab/client/pipeline_triggers_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Client do
-  it { should respond_to :delete_trigger }
+  it { is_expected.to respond_to :delete_trigger }
 
   describe ".triggers" do
     before do
@@ -9,11 +9,11 @@ describe Gitlab::Client do
       @triggers = Gitlab.triggers(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/triggers")).to have_been_made
     end
 
-    it "should return an array of project's triggers" do
+    it "returns an array of project's triggers" do
       expect(@triggers).to be_a Gitlab::PaginatedResponse
       expect(@triggers.first.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
     end
@@ -25,11 +25,11 @@ describe Gitlab::Client do
       @trigger = Gitlab.trigger(3, 10)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/triggers/10")).to have_been_made
     end
 
-    it "should return information about a trigger" do
+    it "returns information about a trigger" do
       expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
       expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
     end
@@ -41,12 +41,12 @@ describe Gitlab::Client do
       @trigger = Gitlab.create_trigger(3, "my description")
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/triggers").
           with(body: { description: "my description" })).to have_been_made
     end
 
-    it "should return information about a new trigger" do
+    it "returns information about a new trigger" do
       expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
       expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
     end
@@ -58,12 +58,12 @@ describe Gitlab::Client do
       @trigger = Gitlab.update_trigger(3, 1, description: "my description")
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_put("/projects/3/triggers/1").
           with(body: { description: "my description" })).to have_been_made
     end
 
-    it "should return information about the trigger" do
+    it "returns information about the trigger" do
       expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
       expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
     end
@@ -75,11 +75,11 @@ describe Gitlab::Client do
       @trigger = Gitlab.trigger_take_ownership(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/triggers/1/take_ownership")).to have_been_made
     end
 
-    it "should return information about the trigger" do
+    it "returns information about the trigger" do
       expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
       expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
     end
@@ -91,7 +91,7 @@ describe Gitlab::Client do
       @trigger = Gitlab.remove_trigger(3, 10)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/projects/3/triggers/10")).to have_been_made
     end
   end
@@ -107,7 +107,7 @@ describe Gitlab::Client do
         Gitlab.private_token = nil
       end
 
-      it "should not raise Error::MissingCredentials" do
+      it "does not raise Error::MissingCredentials" do
         expect { Gitlab.run_trigger(3, "7b9148c158980bbd9bcea92c17522d", "master", {a: 10}) }.to_not raise_error
       end
 
@@ -121,7 +121,7 @@ describe Gitlab::Client do
         @trigger = Gitlab.run_trigger(3, "7b9148c158980bbd9bcea92c17522d", "master")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_request(:post, "#{Gitlab.endpoint}/projects/3/trigger/pipeline").
           with(body: {
             token: "7b9148c158980bbd9bcea92c17522d",
@@ -129,7 +129,7 @@ describe Gitlab::Client do
           })).to have_been_made
       end
 
-      it "should return information about the triggered build" do
+      it "returns information about the triggered build" do
         expect(@trigger.id).to eq(8)
       end
     end
@@ -139,7 +139,7 @@ describe Gitlab::Client do
         @trigger = Gitlab.run_trigger(3, "7b9148c158980bbd9bcea92c17522d", "master", {a: 10})
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_request(:post, "#{Gitlab.endpoint}/projects/3/trigger/pipeline").
           with(body: {
             token: "7b9148c158980bbd9bcea92c17522d",
@@ -148,7 +148,7 @@ describe Gitlab::Client do
           })).to have_been_made
       end
 
-      it "should return information about the triggered build" do
+      it "returns information about the triggered build" do
         expect(@trigger.id).to eq(8)
         expect(@trigger.variables.a).to eq("10")
       end

data/spec/gitlab/client/pipelines_spec.rb

@@ -7,30 +7,30 @@ describe Gitlab::Client do
       @pipelines = Gitlab.pipelines(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/pipelines")).to have_been_made
     end
 
-    it "should return a paginated response of project's pipelines" do
+    it "returns a paginated response of project's pipelines" do
       expect(@pipelines).to be_a Gitlab::PaginatedResponse
     end
   end
-  
+
   describe ".pipeline" do
     before do
       stub_get("/projects/3/pipelines/46", "pipeline")
       @pipeline = Gitlab.pipeline(3, 46)
     end
-    
-    it "should get the correct resource" do
+
+    it "gets the correct resource" do
       expect(a_get("/projects/3/pipelines/46")).to have_been_made
     end
 
-    it "should return a single pipeline" do
+    it "returns a single pipeline" do
       expect(@pipeline).to be_a Gitlab::ObjectifiedHash
     end
-    
-    it "should return information about a pipeline" do
+
+    it "returns information about a pipeline" do
       expect(@pipeline.id).to eq(46)
       expect(@pipeline.user.name).to eq("Administrator")
     end
@@ -42,15 +42,15 @@ describe Gitlab::Client do
       @pipeline_create = Gitlab.create_pipeline(3, 'master')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/pipeline?ref=master")).to have_been_made
     end
 
-    it "should return a single pipeline" do
+    it "returns a single pipeline" do
       expect(@pipeline_create).to be_a Gitlab::ObjectifiedHash
     end
 
-    it "should return information about a pipeline" do
+    it "returns information about a pipeline" do
       expect(@pipeline_create.user.name).to eq("Administrator")
     end
   end
@@ -60,35 +60,35 @@ describe Gitlab::Client do
       stub_post("/projects/3/pipelines/46/cancel", "pipeline_cancel")
       @pipeline_cancel = Gitlab.cancel_pipeline(3, 46)
     end
-    
-    it "should get the correct resource" do
+
+    it "gets the correct resource" do
       expect(a_post("/projects/3/pipelines/46/cancel")).to have_been_made
     end
 
-    it "should return a single pipeline" do
+    it "returns a single pipeline" do
       expect(@pipeline_cancel).to be_a Gitlab::ObjectifiedHash
     end
-    
-    it "should return information about a pipeline" do
+
+    it "returns information about a pipeline" do
       expect(@pipeline_cancel.user.name).to eq("Administrator")
     end
   end
-  
+
   describe ".retry_pipeline" do
     before do
       stub_post("/projects/3/pipelines/46/retry", "pipeline_retry")
       @pipeline_retry = Gitlab.retry_pipeline(3, 46)
     end
-    
-    it "should get the correct resource" do
+
+    it "gets the correct resource" do
       expect(a_post("/projects/3/pipelines/46/retry")).to have_been_made
     end
 
-    it "should return a single pipeline" do
+    it "returns a single pipeline" do
       expect(@pipeline_retry).to be_a Gitlab::ObjectifiedHash
     end
-    
-    it "should return information about a pipeline" do
+
+    it "returns information about a pipeline" do
       expect(@pipeline_retry.user.name).to eq("Administrator")
     end
   end

data/spec/gitlab/client/projects_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Client do
-  it { should respond_to :search_projects }
+  it { is_expected.to respond_to :search_projects }
 
   describe ".projects" do
     before do
@@ -9,11 +9,11 @@ describe Gitlab::Client do
       @projects = Gitlab.projects
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects")).to have_been_made
     end
 
-    it "should return a paginated response of projects" do
+    it "returns 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")
@@ -26,11 +26,11 @@ describe Gitlab::Client do
       @project_search = Gitlab.project_search("Gitlab")
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects?search=Gitlab")).to have_been_made
     end
 
-    it "should return a paginated response of projects found" do
+    it "returns 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")
@@ -43,11 +43,11 @@ describe Gitlab::Client do
       @project = Gitlab.project(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3")).to have_been_made
     end
 
-    it "should return information about a project" do
+    it "returns information about a project" do
       expect(@project.name).to eq("Gitlab")
       expect(@project.owner.name).to eq("John Smith")
     end
@@ -59,16 +59,16 @@ describe Gitlab::Client do
       @events = Gitlab.project_events(2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/2/events")).to have_been_made
     end
 
-    it "should return a paginated response of events" do
+    it "returns a paginated response of events" do
       expect(@events).to be_a Gitlab::PaginatedResponse
       expect(@events.size).to eq(2)
     end
 
-    it "should return the action name of the event" do
+    it "returns the action name of the event" do
       expect(@events.first.action_name).to eq("opened")
     end
   end
@@ -79,11 +79,11 @@ describe Gitlab::Client do
       @project = Gitlab.create_project('Gitlab')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects")).to have_been_made
     end
 
-    it "should return information about a created project" do
+    it "returns information about a created project" do
       expect(@project.name).to eq("Gitlab")
       expect(@project.owner.name).to eq("John Smith")
     end
@@ -97,7 +97,7 @@ describe Gitlab::Client do
       @project = Gitlab.create_project('Brute', user_id: @owner.id)
     end
 
-    it "should return information about a created project" do
+    it "returns information about a created project" do
       expect(@project.name).to eq("Brute")
       expect(@project.owner.name).to eq("John Owner")
     end
@@ -109,11 +109,11 @@ describe Gitlab::Client do
       @project = Gitlab.delete_project('Gitlab')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/projects/Gitlab")).to have_been_made
     end
 
-    it "should return information about a deleted project" do
+    it "returns information about a deleted project" do
       expect(@project.name).to eq("Gitlab")
       expect(@project.owner.name).to eq("John Smith")
     end
@@ -126,11 +126,11 @@ describe Gitlab::Client do
         @project = Gitlab.create_fork(3)
       end
 
-      it "should post to the correct resource" do
+      it "posts to the correct resource" do
         expect(a_post("/projects/3/fork")).to have_been_made
       end
 
-      it "should return information about the forked project" do
+      it "returns information about the forked project" do
         expect(@project.forked_from_project.id).to eq(3)
         expect(@project.id).to eq(20)
       end
@@ -143,11 +143,11 @@ describe Gitlab::Client do
         @project = Gitlab.create_fork(3, sudo: @sudoed_username)
       end
 
-      it "should post to the correct resource" do
+      it "posts to the correct resource" do
         expect(a_post("/projects/3/fork")).to have_been_made
       end
 
-      it "should return information about the forked project" do
+      it "returns 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)
@@ -161,11 +161,11 @@ describe Gitlab::Client do
       @team_members = Gitlab.team_members(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/members")).to have_been_made
     end
 
-    it "should return a paginated response of team members" do
+    it "returns 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
@@ -177,11 +177,11 @@ describe Gitlab::Client do
       @team_member = Gitlab.team_member(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/members/1")).to have_been_made
     end
 
-    it "should return information about a team member" do
+    it "returns information about a team member" do
       expect(@team_member.name).to eq("John Smith")
     end
   end
@@ -192,12 +192,12 @@ describe Gitlab::Client do
       @team_member = Gitlab.add_team_member(3, 1, 40)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/members").
           with(body: { user_id: '1', access_level: '40' })).to have_been_made
     end
 
-    it "should return information about an added team member" do
+    it "returns information about an added team member" do
       expect(@team_member.name).to eq("John Smith")
     end
   end
@@ -208,12 +208,12 @@ describe Gitlab::Client do
       @team_member = Gitlab.edit_team_member(3, 1, 40)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_put("/projects/3/members/1").
           with(body: { access_level: '40' })).to have_been_made
     end
 
-    it "should return information about an edited team member" do
+    it "returns information about an edited team member" do
       expect(@team_member.name).to eq("John Smith")
     end
   end
@@ -224,11 +224,11 @@ describe Gitlab::Client do
       @team_member = Gitlab.remove_team_member(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/projects/3/members/1")).to have_been_made
     end
 
-    it "should return information about a removed team member" do
+    it "returns information about a removed team member" do
       expect(@team_member.name).to eq("John Smith")
     end
   end
@@ -239,11 +239,11 @@ describe Gitlab::Client do
       @hooks = Gitlab.project_hooks(1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/1/hooks")).to have_been_made
     end
 
-    it "should return a paginated response of hooks" do
+    it "returns 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
@@ -255,11 +255,11 @@ describe Gitlab::Client do
       @hook = Gitlab.project_hook(1, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/1/hooks/1")).to have_been_made
     end
 
-    it "should return information about a hook" do
+    it "returns information about a hook" do
       expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
     end
   end
@@ -271,12 +271,12 @@ describe Gitlab::Client do
         @hook = Gitlab.add_project_hook(1, "https://api.example.net/v1/webhooks/ci")
       end
 
-      it "should get the correct resource" do
+      it "gets 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
       end
 
-      it "should return information about an added hook" do
+      it "returns information about an added hook" do
         expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
       end
     end
@@ -287,12 +287,12 @@ describe Gitlab::Client do
         @hook = Gitlab.add_project_hook(1, "https://api.example.net/v1/webhooks/ci", push_events: true, merge_requests_events: true)
       end
 
-      it "should get the correct resource" do
+      it "gets 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
       end
 
-      it "should return information about an added hook" do
+      it "returns information about an added hook" do
         expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
       end
     end
@@ -304,12 +304,12 @@ describe Gitlab::Client do
       @hook = Gitlab.edit_project_hook(1, 1, "https://api.example.net/v1/webhooks/ci")
     end
 
-    it "should get the correct resource" do
+    it "gets 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
     end
 
-    it "should return information about an edited hook" do
+    it "returns information about an edited hook" do
       expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
     end
   end
@@ -321,11 +321,11 @@ describe Gitlab::Client do
         @edited_project = Gitlab.edit_project(3, name: "Gitlab-edit")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_put("/projects/3").with(body: { name: "Gitlab-edit" })).to have_been_made
       end
 
-      it "should return information about an edited project" do
+      it "returns information about an edited project" do
         expect(@edited_project.name).to eq("Gitlab-edit")
       end
     end
@@ -348,11 +348,11 @@ describe Gitlab::Client do
         @hook = Gitlab.delete_project_hook(1, 1)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/1/hooks/1")).to have_been_made
       end
 
-      it "should return false" do
+      it "returns false" do
         expect(@hook).to be(false)
       end
     end
@@ -363,11 +363,11 @@ describe Gitlab::Client do
         @hook = Gitlab.delete_project_hook(1, 1)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/1/hooks/1")).to have_been_made
       end
 
-      it "should return information about a deleted hook" do
+      it "returns information about a deleted hook" do
         expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
       end
     end
@@ -379,11 +379,11 @@ describe Gitlab::Client do
       @push_rule = Gitlab.push_rule(1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/1/push_rule")).to have_been_made
     end
 
-    it "should return information about a push rule" do
+    it "returns information about a push rule" do
       expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
     end
   end
@@ -394,11 +394,11 @@ describe Gitlab::Client do
       @push_rule = Gitlab.add_push_rule(1, { deny_delete_tag: false, commit_message_regex: "\\b[A-Z]{3}-[0-9]+\\b" })
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/1/push_rule")).to have_been_made
     end
 
-    it "should return information about an added push rule" do
+    it "returns information about an added push rule" do
       expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
     end
   end
@@ -409,11 +409,11 @@ describe Gitlab::Client do
       @push_rule = Gitlab.edit_push_rule(1, { deny_delete_tag: false, commit_message_regex: "\\b[A-Z]{3}-[0-9]+\\b" })
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_put("/projects/1/push_rule")).to have_been_made
     end
 
-    it "should return information about an edited push rule" do
+    it "returns information about an edited push rule" do
       expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
     end
   end
@@ -427,11 +427,11 @@ describe Gitlab::Client do
         @push_rule = Gitlab.delete_push_rule(1)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/1/push_rule")).to have_been_made
       end
 
-      it "should return false" do
+      it "returns false" do
         expect(@push_rule).to be(false)
       end
     end
@@ -442,11 +442,11 @@ describe Gitlab::Client do
         @push_rule = Gitlab.delete_push_rule(1)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/1/push_rule")).to have_been_made
       end
 
-      it "should return information about a deleted push rule" do
+      it "returns information about a deleted push rule" do
         expect(@push_rule.commit_message_regex).to eq("\\b[A-Z]{3}-[0-9]+\\b")
       end
     end
@@ -458,11 +458,11 @@ describe Gitlab::Client do
       @forked_project_link = Gitlab.make_forked_from(42, 24)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/42/fork/24")).to have_been_made
     end
 
-    it "should return information about a forked project" do
+    it "returns information about a forked project" do
       expect(@forked_project_link.forked_from_project_id).to eq(24)
       expect(@forked_project_link.forked_to_project_id).to eq(42)
     end
@@ -474,11 +474,11 @@ describe Gitlab::Client do
       @forked_project_link = Gitlab.remove_forked(42)
     end
 
-    it "should be sent to correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/projects/42/fork")).to have_been_made
     end
 
-    it "should return information about an unforked project" do
+    it "returns information about an unforked project" do
       expect(@forked_project_link.forked_to_project_id).to eq(42)
     end
   end
@@ -489,11 +489,11 @@ describe Gitlab::Client do
       @deploy_keys = Gitlab.deploy_keys(42)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/42/deploy_keys")).to have_been_made
     end
 
-    it "should return project deploy keys" do
+    it "returns project deploy keys" do
       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"
@@ -507,11 +507,11 @@ describe Gitlab::Client do
       @deploy_key = Gitlab.deploy_key(42, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/42/deploy_keys/2")).to have_been_made
     end
 
-    it "should return project deploy key" do
+    it "returns project deploy key" do
       expect(@deploy_key.id).to eq 2
       expect(@deploy_key.title).to eq "Key Title"
       expect(@deploy_key.key).to match(/ssh-rsa/)
@@ -524,11 +524,11 @@ describe Gitlab::Client do
       @deploy_key = Gitlab.delete_deploy_key(42, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/projects/42/deploy_keys/2")).to have_been_made
     end
 
-    it "should return information about a deleted key" do
+    it "returns information about a deleted key" do
       expect(@deploy_key.id).to eq(2)
     end
   end
@@ -539,12 +539,12 @@ describe Gitlab::Client do
       @deploy_key = Gitlab.enable_deploy_key(42, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/42/deploy_keys/2/enable").
           with(body: { id: '42', key_id: '2' })).to have_been_made
     end
 
-    it "should return information about an enabled key" do
+    it "returns information about an enabled key" do
       expect(@deploy_key.id).to eq(2)
     end
   end
@@ -555,12 +555,12 @@ describe Gitlab::Client do
       @deploy_key = Gitlab.disable_deploy_key(42, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/42/deploy_keys/2/disable").
           with(body: { id: '42', key_id: '2' })).to have_been_made
     end
 
-    it "should return information about a disabled key" do
+    it "returns information about a disabled key" do
       expect(@deploy_key.id).to eq(2)
     end
   end
@@ -571,12 +571,12 @@ describe Gitlab::Client do
       @group = Gitlab.share_project_with_group(3, 10, 40)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/share").
           with(body: { group_id: '10', group_access: '40' })).to have_been_made
     end
 
-    it "should return information about an added group" do
+    it "returns information about an added group" do
       expect(@group.id).to eq(10)
     end
   end
@@ -587,11 +587,11 @@ describe Gitlab::Client do
       @starred_project = Gitlab.star_project(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/star")).to have_been_made
     end
 
-    it "should return information about the starred project" do
+    it "returns information about the starred project" do
       expect(@starred_project.id).to eq(3)
     end
   end
@@ -602,11 +602,11 @@ describe Gitlab::Client do
       @unstarred_project = Gitlab.unstar_project(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_delete("/projects/3/star")).to have_been_made
     end
 
-    it "should return information about the unstarred project" do
+    it "returns information about the unstarred project" do
       expect(@unstarred_project.id).to eq(3)
     end
   end