gitlab 4.2.0 → 4.3.0

data/spec/gitlab/client/merge_requests_spec.rb

@@ -7,11 +7,11 @@ describe Gitlab::Client do
       @merge_requests = Gitlab.merge_requests(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/merge_requests")).to have_been_made
     end
 
-    it "should return a paginated response of project's merge requests" do
+    it "returns a paginated response of project's merge requests" do
       expect(@merge_requests).to be_a Gitlab::PaginatedResponse
       expect(@merge_requests.first.project_id).to eq(3)
     end
@@ -23,11 +23,11 @@ describe Gitlab::Client do
       @merge_request = Gitlab.merge_request(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/merge_requests/1")).to have_been_made
     end
 
-    it "should return information about a merge request" do
+    it "returns information about a merge request" do
       expect(@merge_request.project_id).to eq(3)
       expect(@merge_request.assignee.name).to eq("Jack Smith")
     end
@@ -38,7 +38,7 @@ describe Gitlab::Client do
       stub_post("/projects/3/merge_requests", "merge_request")
     end
 
-    it "should return information about a merge request" do
+    it "returns information about a merge request" do
       @merge_request = Gitlab.create_merge_request(3, 'New feature',
                                                    source_branch: 'api',
                                                    target_branch: 'master'
@@ -63,7 +63,7 @@ describe Gitlab::Client do
                                                   )
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_put("/projects/3/merge_requests/2").
         with(body: {
                assignee_id: '1',
@@ -72,7 +72,7 @@ describe Gitlab::Client do
              })).to have_been_made
     end
 
-    it "should return information about a merge request" do
+    it "returns information about a merge request" do
       expect(@merge_request.project_id).to eq(3)
       expect(@merge_request.assignee.name).to eq("Jack Smith")
     end
@@ -85,12 +85,12 @@ describe Gitlab::Client do
       @merge_request = Gitlab.accept_merge_request(5, 42, merge_commit_message: 'Nice!')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_put("/projects/5/merge_requests/42/merge").
         with(body: { merge_commit_message: 'Nice!' })).to have_been_made
     end
 
-    it "should return information about merged merge request" do
+    it "returns information about merged merge request" do
       expect(@merge_request.project_id).to eq(3)
       expect(@merge_request.assignee.name).to eq("Jack Smith")
     end
@@ -102,11 +102,11 @@ describe Gitlab::Client do
       @merge_request = Gitlab.merge_request_comments(3, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/merge_requests/2/notes")).to have_been_made
     end
 
-    it "should return merge request's comments" do
+    it "returns merge request's comments" do
       expect(@merge_request).to be_an Gitlab::PaginatedResponse
       expect(@merge_request.length).to eq(2)
       expect(@merge_request[0].note).to eq("this is the 1st comment on the 2merge merge request")
@@ -122,11 +122,11 @@ describe Gitlab::Client do
       @merge_request = Gitlab.create_merge_request_comment(3, 2, 'Cool Merge Request!')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/merge_requests/2/notes")).to have_been_made
     end
 
-    it "should return information about a merge request" do
+    it "returns information about a merge request" do
       expect(@merge_request.note).to eq('Cool Merge Request!')
       expect(@merge_request.author.id).to eq(1)
     end
@@ -138,11 +138,11 @@ describe Gitlab::Client do
       @mr_changes = Gitlab.merge_request_changes(3, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/merge_requests/2/changes")).to have_been_made
     end
 
-    it "should return the merge request changes" do
+    it "returns the merge request changes" do
       expect(@mr_changes.changes).to be_a Array
       expect(@mr_changes.changes.first['old_path']).to eq('lib/omniauth/builder.rb')
       expect(@mr_changes.id).to eq(2)
@@ -158,11 +158,11 @@ describe Gitlab::Client do
       @mr_commits = Gitlab.merge_request_commits(3, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/merge_requests/2/commits")).to have_been_made
     end
 
-    it "should return the merge request commits" do
+    it "returns the merge request commits" do
       expect(@mr_commits).to be_a Gitlab::PaginatedResponse
       expect(@mr_commits.size).to eq 2
       expect(@mr_commits.first.id).to eq "a2da7552f26d5b46a6a09bb8b7b066e3a102be7d"
@@ -181,11 +181,11 @@ describe Gitlab::Client do
       @issues = Gitlab.merge_request_closes_issues(5, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/5/merge_requests/1/closes_issues")).to have_been_made
     end
 
-    it "should return a paginated response of the issues the merge_request will close" do
+    it "returns a paginated response of the issues the merge_request will close" do
       expect(@issues).to be_a(Gitlab::PaginatedResponse)
       expect(@issues.first.title).to eq("Merge request 1 issue 1")
       expect(@issues.size).to eq(2)
@@ -198,11 +198,11 @@ describe Gitlab::Client do
       @merge_request = Gitlab.subscribe_to_merge_request(3, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/merge_requests/2/subscribe")).to have_been_made
     end
 
-    it "should return information about a merge request" do
+    it "returns information about a merge request" do
       expect(@merge_request.project_id).to eq(3)
     end
   end
@@ -213,11 +213,11 @@ describe Gitlab::Client do
       @merge_request = Gitlab.unsubscribe_from_merge_request(3, 2)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/merge_requests/2/unsubscribe")).to have_been_made
     end
 
-    it "should return information about a merge request" do
+    it "returns information about a merge request" do
       expect(@merge_request.project_id).to eq(3)
     end
   end

data/spec/gitlab/client/milestones_spec.rb

@@ -7,11 +7,11 @@ describe Gitlab::Client do
       @milestones = Gitlab.milestones(3)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/milestones")).to have_been_made
     end
 
-    it "should return a paginated response of project's milestones" do
+    it "returns a paginated response of project's milestones" do
       expect(@milestones).to be_a Gitlab::PaginatedResponse
       expect(@milestones.first.project_id).to eq(3)
     end
@@ -23,11 +23,11 @@ describe Gitlab::Client do
       @milestone = Gitlab.milestone(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/milestones/1")).to have_been_made
     end
 
-    it "should return information about a milestone" do
+    it "returns information about a milestone" do
       expect(@milestone.project_id).to eq(3)
     end
   end
@@ -38,11 +38,11 @@ describe Gitlab::Client do
       @milestone_issues = Gitlab.milestone_issues(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/milestones/1/issues")).to have_been_made
     end
 
-    it "should return a paginated response of milestone's issues" do
+    it "returns a paginated response of milestone's issues" do
       expect(@milestone_issues).to be_a Gitlab::PaginatedResponse
       expect(@milestone_issues.first.milestone.id).to eq(1)
     end
@@ -54,11 +54,11 @@ describe Gitlab::Client do
       @milestone_merge_requests = Gitlab.milestone_merge_requests(3, 1)
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/projects/3/milestones/1/merge_requests")).to have_been_made
     end
 
-    it "should return a paginated response of milestone's merge_requests" do
+    it "returns a paginated response of milestone's merge_requests" do
       expect(@milestone_merge_requests).to be_a Gitlab::PaginatedResponse
       expect(@milestone_merge_requests.first.milestone.id).to eq(1)
     end
@@ -70,12 +70,12 @@ describe Gitlab::Client do
       @milestone = Gitlab.create_milestone(3, 'title')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_post("/projects/3/milestones").
         with(body: { title: 'title' })).to have_been_made
     end
 
-    it "should return information about a created milestone" do
+    it "returns information about a created milestone" do
       expect(@milestone.project_id).to eq(3)
     end
   end
@@ -86,12 +86,12 @@ describe Gitlab::Client do
       @milestone = Gitlab.edit_milestone(3, 33, title: 'title')
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_put("/projects/3/milestones/33").
         with(body: { title: 'title' })).to have_been_made
     end
 
-    it "should return information about an edited milestone" do
+    it "returns information about an edited milestone" do
       expect(@milestone.project_id).to eq(3)
     end
   end

data/spec/gitlab/client/namespaces_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Client do
-  it { should respond_to :namespaces }
+  it { is_expected.to respond_to :namespaces }
 
   describe ".namespaces" do
     before do
@@ -9,11 +9,11 @@ describe Gitlab::Client do
       @namespaces = Gitlab.namespaces
     end
 
-    it "should get the correct resource" do
+    it "gets the correct resource" do
       expect(a_get("/namespaces")).to have_been_made
     end
 
-    it "should return a paginated response of namespaces" do
+    it "returns 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")

data/spec/gitlab/client/notes_spec.rb

@@ -8,11 +8,11 @@ describe Gitlab::Client do
         @notes = Gitlab.notes(3)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/notes")).to have_been_made
       end
 
-      it "should return a paginated response of notes" do
+      it "returns a paginated response of notes" do
         expect(@notes).to be_a Gitlab::PaginatedResponse
         expect(@notes.first.author.name).to eq("John Smith")
       end
@@ -24,11 +24,11 @@ describe Gitlab::Client do
         @notes = Gitlab.issue_notes(3, 7)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/issues/7/notes")).to have_been_made
       end
 
-      it "should return a paginated response of notes" do
+      it "returns a paginated response of notes" do
         expect(@notes).to be_a Gitlab::PaginatedResponse
         expect(@notes.first.author.name).to eq("John Smith")
       end
@@ -40,11 +40,11 @@ describe Gitlab::Client do
         @notes = Gitlab.snippet_notes(3, 7)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/snippets/7/notes")).to have_been_made
       end
 
-      it "should return a paginated response of notes" do
+      it "returns a paginated response of notes" do
         expect(@notes).to be_a Gitlab::PaginatedResponse
         expect(@notes.first.author.name).to eq("John Smith")
       end
@@ -56,11 +56,11 @@ describe Gitlab::Client do
         @notes = Gitlab.merge_request_notes(3, 7)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/merge_requests/7/notes")).to have_been_made
       end
 
-      it "should return a paginated response of notes" do
+      it "returns a paginated response of notes" do
         expect(@notes).to be_a Gitlab::PaginatedResponse
         expect(@notes.first.author.name).to eq("John Smith")
       end
@@ -74,11 +74,11 @@ describe Gitlab::Client do
         @note = Gitlab.note(3, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/notes/1201")).to have_been_made
       end
 
-      it "should return information about a note" do
+      it "returns information about a note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -90,11 +90,11 @@ describe Gitlab::Client do
         @note = Gitlab.issue_note(3, 7, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/issues/7/notes/1201")).to have_been_made
       end
 
-      it "should return information about a note" do
+      it "returns information about a note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -106,11 +106,11 @@ describe Gitlab::Client do
         @note = Gitlab.snippet_note(3, 7, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/snippets/7/notes/1201")).to have_been_made
       end
 
-      it "should return information about a note" do
+      it "returns information about a note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -122,11 +122,11 @@ describe Gitlab::Client do
         @note = Gitlab.merge_request_note(3, 7, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_get("/projects/3/merge_requests/7/notes/1201")).to have_been_made
       end
 
-      it "should return information about a note" do
+      it "returns information about a note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -140,12 +140,12 @@ describe Gitlab::Client do
         @note = Gitlab.create_note(3, "The solution is rather tricky")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_post("/projects/3/notes").
           with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
-      it "should return information about a created note" do
+      it "returns information about a created note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -157,12 +157,12 @@ describe Gitlab::Client do
         @note = Gitlab.create_issue_note(3, 7, "The solution is rather tricky")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_post("/projects/3/issues/7/notes").
           with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
-      it "should return information about a created note" do
+      it "returns information about a created note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -174,12 +174,12 @@ describe Gitlab::Client do
         @note = Gitlab.create_snippet_note(3, 7, "The solution is rather tricky")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_post("/projects/3/snippets/7/notes").
           with(body: { body: 'The solution is rather tricky' })).to have_been_made
       end
 
-      it "should return information about a created note" do
+      it "returns information about a created note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -191,12 +191,12 @@ describe Gitlab::Client do
         @note = Gitlab.create_merge_request_note(3, 7, "The solution is rather tricky")
       end
 
-      it "should get the correct resource" do
+      it "gets 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
       end
 
-      it "should return information about a created note" do
+      it "returns information about a created note" do
         expect(@note.body).to eq("The solution is rather tricky")
         expect(@note.author.name).to eq("John Smith")
       end
@@ -210,11 +210,11 @@ describe Gitlab::Client do
         @note = Gitlab.delete_note(3, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/3/notes/1201")).to have_been_made
       end
 
-      it "should return information about a deleted note" do
+      it "returns information about a deleted note" do
         expect(@note.id).to eq(1201)
       end
     end
@@ -225,11 +225,11 @@ describe Gitlab::Client do
         @note = Gitlab.delete_issue_note(3, 7, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/3/issues/7/notes/1201")).to have_been_made
       end
 
-      it "should return information about a deleted issue note" do
+      it "returns information about a deleted issue note" do
         expect(@note.id).to eq(1201)
       end
     end
@@ -240,11 +240,11 @@ describe Gitlab::Client do
         @note = Gitlab.delete_snippet_note(3, 7, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/3/snippets/7/notes/1201")).to have_been_made
       end
 
-      it "should return information about a deleted snippet note" do
+      it "returns information about a deleted snippet note" do
         expect(@note.id).to eq(1201)
       end
     end
@@ -255,11 +255,11 @@ describe Gitlab::Client do
         @note = Gitlab.delete_merge_request_note(3, 7, 1201)
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_delete("/projects/3/merge_requests/7/notes/1201")).to have_been_made
       end
 
-      it "should return information about a deleted merge request note" do
+      it "returns information about a deleted merge request note" do
         expect(@note.id).to eq(1201)
       end
     end
@@ -272,12 +272,12 @@ describe Gitlab::Client do
         @note = Gitlab.edit_note(3, 1201, body: "edited wall note content")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_put("/projects/3/notes/1201").
           with(body: {body: 'edited wall note content'})).to have_been_made
       end
 
-      it "should return information about a modified note" do
+      it "returns information about a modified note" do
         expect(@note.id).to eq(1201)
       end
     end
@@ -288,12 +288,12 @@ describe Gitlab::Client do
         @note = Gitlab.edit_issue_note(3, 7, 1201, body: "edited issue note content")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_put("/projects/3/issues/7/notes/1201").
           with(body: {body: 'edited issue note content'})).to have_been_made
       end
 
-      it "should return information about a modified issue note" do
+      it "returns information about a modified issue note" do
         expect(@note.id).to eq(1201)
       end
     end
@@ -304,12 +304,12 @@ describe Gitlab::Client do
         @note = Gitlab.edit_snippet_note(3, 7, 1201, body: "edited snippet note content")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_put("/projects/3/snippets/7/notes/1201").
           with(body: {body: 'edited snippet note content'})).to have_been_made
       end
 
-      it "should return information about a modified snippet note" do
+      it "returns information about a modified snippet note" do
         expect(@note.id).to eq(1201)
       end
     end
@@ -320,12 +320,12 @@ describe Gitlab::Client do
         @note = Gitlab.edit_merge_request_note(3, 7, 1201, body: "edited merge request note content")
       end
 
-      it "should get the correct resource" do
+      it "gets the correct resource" do
         expect(a_put("/projects/3/merge_requests/7/notes/1201").
           with(body: {body: 'edited merge request note content'})).to have_been_made
       end
 
-      it "should return information about a modified request note" do
+      it "returns information about a modified request note" do
         expect(@note.id).to eq(1201)
       end
     end