Use HTTP matchers if possible

1 files changed, 41 insertions, 41 deletions

diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index beb29a68692..bacd01f8e74 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -40,7 +40,7 @@ describe API::API, api: true  do
       it "should return an array of issue notes" do
         get api("/projects/#{project.id}/issues/#{issue.id}/notes", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(issue_note.note)
       end
@@ -48,14 +48,14 @@ describe API::API, api: true  do
       it "should return a 404 error when issue id not found" do
         get api("/projects/#{project.id}/issues/12345/notes", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       context "and current user cannot view the notes" do
         it "should return an empty array" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
 
-          expect(response.status).to eq(200)
+          expect(response).to have_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response).to be_empty
         end
@@ -66,7 +66,7 @@ describe API::API, api: true  do
           it "returns 404" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
 
-            expect(response.status).to eq(404)
+            expect(response).to have_http_status(404)
           end
         end
 
@@ -74,7 +74,7 @@ describe API::API, api: true  do
           it "should return an empty array" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", private_user)
 
-            expect(response.status).to eq(200)
+            expect(response).to have_http_status(200)
             expect(json_response).to be_an Array
             expect(json_response.first['body']).to eq(cross_reference_note.note)
           end
@@ -86,7 +86,7 @@ describe API::API, api: true  do
       it "should return an array of snippet notes" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(snippet_note.note)
       end
@@ -94,13 +94,13 @@ describe API::API, api: true  do
       it "should return a 404 error when snippet id not found" do
         get api("/projects/#{project.id}/snippets/42/notes", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       it "returns 404 when not authorized" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes", private_user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
 
@@ -108,7 +108,7 @@ describe API::API, api: true  do
       it "should return an array of merge_requests notes" do
         get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/notes", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(merge_request_note.note)
       end
@@ -116,13 +116,13 @@ describe API::API, api: true  do
       it "should return a 404 error if merge request id not found" do
         get api("/projects/#{project.id}/merge_requests/4444/notes", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       it "returns 404 when not authorized" do
         get api("/projects/#{project.id}/merge_requests/4444/notes", private_user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
   end
@@ -132,21 +132,21 @@ describe API::API, api: true  do
       it "should return an issue note by id" do
         get api("/projects/#{project.id}/issues/#{issue.id}/notes/#{issue_note.id}", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response['body']).to eq(issue_note.note)
       end
 
       it "should return a 404 error if issue note not found" do
         get api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       context "and current user cannot view the note" do
         it "should return a 404 error" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", user)
 
-          expect(response.status).to eq(404)
+          expect(response).to have_http_status(404)
         end
 
         context "when issue is confidential" do
@@ -155,7 +155,7 @@ describe API::API, api: true  do
           it "returns 404" do
             get api("/projects/#{project.id}/issues/#{issue.id}/notes/#{issue_note.id}", private_user)
 
-            expect(response.status).to eq(404)
+            expect(response).to have_http_status(404)
           end
         end
 
@@ -164,7 +164,7 @@ describe API::API, api: true  do
           it "should return an issue note by id" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", private_user)
 
-            expect(response.status).to eq(200)
+            expect(response).to have_http_status(200)
             expect(json_response['body']).to eq(cross_reference_note.note)
           end
         end
@@ -175,14 +175,14 @@ describe API::API, api: true  do
       it "should return a snippet note by id" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes/#{snippet_note.id}", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response['body']).to eq(snippet_note.note)
       end
 
       it "should return a 404 error if snippet note not found" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes/12345", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
   end
@@ -192,7 +192,7 @@ describe API::API, api: true  do
       it "should create a new issue note" do
         post api("/projects/#{project.id}/issues/#{issue.id}/notes", user), body: 'hi!'
 
-        expect(response.status).to eq(201)
+        expect(response).to have_http_status(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
       end
@@ -200,13 +200,13 @@ describe API::API, api: true  do
       it "should return a 400 bad request error if body not given" do
         post api("/projects/#{project.id}/issues/#{issue.id}/notes", user)
 
-        expect(response.status).to eq(400)
+        expect(response).to have_http_status(400)
       end
 
       it "should return a 401 unauthorized error if user not authenticated" do
         post api("/projects/#{project.id}/issues/#{issue.id}/notes"), body: 'hi!'
 
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
 
       context 'when an admin or owner makes the request' do
@@ -215,7 +215,7 @@ describe API::API, api: true  do
           post api("/projects/#{project.id}/issues/#{issue.id}/notes", user),
             body: 'hi!', created_at: creation_time
 
-          expect(response.status).to eq(201)
+          expect(response).to have_http_status(201)
           expect(json_response['body']).to eq('hi!')
           expect(json_response['author']['username']).to eq(user.username)
           expect(Time.parse(json_response['created_at'])).to be_within(1.second).of(creation_time)
@@ -228,7 +228,7 @@ describe API::API, api: true  do
       it "should create a new snippet note" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user), body: 'hi!'
 
-        expect(response.status).to eq(201)
+        expect(response).to have_http_status(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
       end
@@ -236,13 +236,13 @@ describe API::API, api: true  do
       it "should return a 400 bad request error if body not given" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
 
-        expect(response.status).to eq(400)
+        expect(response).to have_http_status(400)
       end
 
       it "should return a 401 unauthorized error if user not authenticated" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes"), body: 'hi!'
 
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
@@ -282,7 +282,7 @@ describe API::API, api: true  do
         put api("/projects/#{project.id}/issues/#{issue.id}/"\
                   "notes/#{issue_note.id}", user), body: 'Hello!'
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -290,14 +290,14 @@ describe API::API, api: true  do
         put api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user),
                 body: 'Hello!'
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       it 'should return a 400 bad request error if body not given' do
         put api("/projects/#{project.id}/issues/#{issue.id}/"\
                   "notes/#{issue_note.id}", user)
 
-        expect(response.status).to eq(400)
+        expect(response).to have_http_status(400)
       end
     end
 
@@ -306,7 +306,7 @@ describe API::API, api: true  do
         put api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/#{snippet_note.id}", user), body: 'Hello!'
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -314,7 +314,7 @@ describe API::API, api: true  do
         put api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/12345", user), body: "Hello!"
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
 
@@ -323,7 +323,7 @@ describe API::API, api: true  do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\
                   "notes/#{merge_request_note.id}", user), body: 'Hello!'
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -331,7 +331,7 @@ describe API::API, api: true  do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\
                   "notes/12345", user), body: "Hello!"
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
   end
@@ -342,17 +342,17 @@ describe API::API, api: true  do
         delete api("/projects/#{project.id}/issues/#{issue.id}/"\
                    "notes/#{issue_note.id}", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         # Check if note is really deleted
         delete api("/projects/#{project.id}/issues/#{issue.id}/"\
                    "notes/#{issue_note.id}", user)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
 
@@ -361,18 +361,18 @@ describe API::API, api: true  do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/#{snippet_note.id}", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         # Check if note is really deleted
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/#{snippet_note.id}", user)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/12345", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
 
@@ -381,18 +381,18 @@ describe API::API, api: true  do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.id}/notes/#{merge_request_note.id}", user)
 
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         # Check if note is really deleted
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.id}/notes/#{merge_request_note.id}", user)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.id}/notes/12345", user)
 
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
       end
     end
   end