Use HTTP matchers if possible

1 files changed, 101 insertions, 101 deletions

diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index a7690f430c4..056256a29f5 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -15,7 +15,7 @@ describe API::API, api: true  do
     context "when unauthenticated" do
       it "should return authentication error" do
         get api("/users")
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
@@ -29,18 +29,18 @@ describe API::API, api: true  do
 
         it "renders 403" do
           get api("/users")
-          expect(response.status).to eq(403)
+          expect(response).to have_http_status(403)
         end
 
         it "renders 404" do
           get api("/users/#{user.id}")
-          expect(response.status).to eq(404)
+          expect(response).to have_http_status(404)
         end
       end
 
       it "should return an array of users" do
         get api("/users", user)
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         username = user.username
         expect(json_response.detect do |user|
@@ -50,7 +50,7 @@ describe API::API, api: true  do
 
       it "should return one user" do
         get api("/users?username=#{omniauth_user.username}", 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['username']).to eq(omniauth_user.username)
       end
@@ -59,7 +59,7 @@ describe API::API, api: true  do
     context "when admin" do
       it "should return an array of users" do
         get api("/users", admin)
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first.keys).to include 'email'
         expect(json_response.first.keys).to include 'identities'
@@ -74,24 +74,24 @@ describe API::API, api: true  do
   describe "GET /users/:id" do
     it "should return a user by id" do
       get api("/users/#{user.id}", user)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response['username']).to eq(user.username)
     end
 
     it "should return a 401 if unauthenticated" do
       get api("/users/9998")
-      expect(response.status).to eq(401)
+      expect(response).to have_http_status(401)
     end
 
     it "should return a 404 error if user id not found" do
       get api("/users/9999", user)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
 
     it "should return a 404 if invalid ID" do
       get api("/users/1ASDF", user)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
     end
   end
 
@@ -106,7 +106,7 @@ describe API::API, api: true  do
 
     it "should create user with correct attributes" do
       post api('/users', admin), attributes_for(:user, admin: true, can_create_group: true)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
       user_id = json_response['id']
       new_user = User.find(user_id)
       expect(new_user).not_to eq(nil)
@@ -116,7 +116,7 @@ describe API::API, api: true  do
 
     it "should create non-admin user" do
       post api('/users', admin), attributes_for(:user, admin: false, can_create_group: false)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
       user_id = json_response['id']
       new_user = User.find(user_id)
       expect(new_user).not_to eq(nil)
@@ -126,7 +126,7 @@ describe API::API, api: true  do
 
     it "should create non-admin users by default" do
       post api('/users', admin), attributes_for(:user)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
       user_id = json_response['id']
       new_user = User.find(user_id)
       expect(new_user).not_to eq(nil)
@@ -135,12 +135,12 @@ describe API::API, api: true  do
 
     it "should return 201 Created on success" do
       post api("/users", admin), attributes_for(:user, projects_limit: 3)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
     end
 
     it 'creates non-external users by default' do
       post api("/users", admin), attributes_for(:user)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
 
       user_id = json_response['id']
       new_user = User.find(user_id)
@@ -150,7 +150,7 @@ describe API::API, api: true  do
 
     it 'should allow an external user to be created' do
       post api("/users", admin), attributes_for(:user, external: true)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
 
       user_id = json_response['id']
       new_user = User.find(user_id)
@@ -163,27 +163,27 @@ describe API::API, api: true  do
         email: 'invalid email',
         password: 'password',
         name: 'test'
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
     end
 
     it 'should return 400 error if name not given' do
       post api('/users', admin), attributes_for(:user).except(:name)
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
     end
 
     it 'should return 400 error if password not given' do
       post api('/users', admin), attributes_for(:user).except(:password)
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
     end
 
     it 'should return 400 error if email not given' do
       post api('/users', admin), attributes_for(:user).except(:email)
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
     end
 
     it 'should return 400 error if username not given' do
       post api('/users', admin), attributes_for(:user).except(:username)
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
     end
 
     it 'should return 400 error if user does not validate' do
@@ -194,7 +194,7 @@ describe API::API, api: true  do
         name: 'test',
         bio: 'g' * 256,
         projects_limit: -1
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']['password']).
         to eq(['is too short (minimum is 8 characters)'])
       expect(json_response['message']['bio']).
@@ -207,7 +207,7 @@ describe API::API, api: true  do
 
     it "shouldn't available for non admin users" do
       post api("/users", user), attributes_for(:user)
-      expect(response.status).to eq(403)
+      expect(response).to have_http_status(403)
     end
 
     context 'with existing user' do
@@ -227,7 +227,7 @@ describe API::API, api: true  do
             password: 'password',
             username: 'foo'
         end.to change { User.count }.by(0)
-        expect(response.status).to eq(409)
+        expect(response).to have_http_status(409)
         expect(json_response['message']).to eq('Email has already been taken')
       end
 
@@ -239,7 +239,7 @@ describe API::API, api: true  do
             password: 'password',
             username: 'test'
         end.to change { User.count }.by(0)
-        expect(response.status).to eq(409)
+        expect(response).to have_http_status(409)
         expect(json_response['message']).to eq('Username has already been taken')
       end
     end
@@ -249,7 +249,7 @@ describe API::API, api: true  do
 
     it "should redirect to sign in page" do
       get "/users/sign_up"
-      expect(response.status).to eq(302)
+      expect(response).to have_http_status(302)
       expect(response).to redirect_to(new_user_session_path)
     end
   end
@@ -261,41 +261,41 @@ describe API::API, api: true  do
 
     it "should update user with new bio" do
       put api("/users/#{user.id}", admin), { bio: 'new test bio' }
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response['bio']).to eq('new test bio')
       expect(user.reload.bio).to eq('new test bio')
     end
 
     it 'should update user with his own email' do
       put api("/users/#{user.id}", admin), email: user.email
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response['email']).to eq(user.email)
       expect(user.reload.email).to eq(user.email)
     end
 
     it 'should update user with his own username' do
       put api("/users/#{user.id}", admin), username: user.username
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response['username']).to eq(user.username)
       expect(user.reload.username).to eq(user.username)
     end
 
     it "should update user's existing identity" do
       put api("/users/#{omniauth_user.id}", admin), provider: 'ldapmain', extern_uid: '654321'
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(omniauth_user.reload.identities.first.extern_uid).to eq('654321')
     end
 
     it 'should update user with new identity' do
       put api("/users/#{user.id}", admin), provider: 'github', extern_uid: '67890'
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(user.reload.identities.first.extern_uid).to eq('67890')
       expect(user.reload.identities.first.provider).to eq('github')
     end
 
     it "should update admin status" do
       put api("/users/#{user.id}", admin), { admin: true }
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response['is_admin']).to eq(true)
       expect(user.reload.admin).to eq(true)
     end
@@ -309,7 +309,7 @@ describe API::API, api: true  do
 
     it "should not update admin status" do
       put api("/users/#{admin_user.id}", admin), { can_create_group: false }
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response['is_admin']).to eq(true)
       expect(admin_user.reload.admin).to eq(true)
       expect(admin_user.can_create_group).to eq(false)
@@ -317,18 +317,18 @@ describe API::API, api: true  do
 
     it "should not allow invalid update" do
       put api("/users/#{user.id}", admin), { email: 'invalid email' }
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(user.reload.email).not_to eq('invalid email')
     end
 
     it "shouldn't available for non admin users" do
       put api("/users/#{user.id}", user), attributes_for(:user)
-      expect(response.status).to eq(403)
+      expect(response).to have_http_status(403)
     end
 
     it "should return 404 for non-existing user" do
       put api("/users/999999", admin), { bio: 'update should fail' }
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
 
@@ -344,7 +344,7 @@ describe API::API, api: true  do
         name: 'test',
         bio: 'g' * 256,
         projects_limit: -1
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']['password']).
         to eq(['is too short (minimum is 8 characters)'])
       expect(json_response['message']['bio']).
@@ -364,14 +364,14 @@ describe API::API, api: true  do
 
       it 'should return 409 conflict error if email address exists' do
         put api("/users/#{@user.id}", admin), email: 'test@example.com'
-        expect(response.status).to eq(409)
+        expect(response).to have_http_status(409)
         expect(@user.reload.email).to eq(@user.email)
       end
 
       it 'should return 409 conflict error if username taken' do
         @user_id = User.all.last.id
         put api("/users/#{@user.id}", admin), username: 'test'
-        expect(response.status).to eq(409)
+        expect(response).to have_http_status(409)
         expect(@user.reload.username).to eq(@user.username)
       end
     end
@@ -382,13 +382,13 @@ describe API::API, api: true  do
 
     it "should not create invalid ssh key" do
       post api("/users/#{user.id}/keys", admin), { title: "invalid key" }
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']).to eq('400 (Bad request) "key" not given')
     end
 
     it 'should not create key without title' do
       post api("/users/#{user.id}/keys", admin), key: 'some key'
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']).to eq('400 (Bad request) "title" not given')
     end
 
@@ -401,7 +401,7 @@ describe API::API, api: true  do
 
     it "should return 405 for invalid ID" do
       post api("/users/ASDF/keys", admin)
-      expect(response.status).to eq(405)
+      expect(response).to have_http_status(405)
     end
   end
 
@@ -411,14 +411,14 @@ describe API::API, api: true  do
     context 'when unauthenticated' do
       it 'should return authentication error' do
         get api("/users/#{user.id}/keys")
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
     context 'when authenticated' do
       it 'should return 404 for non-existing user' do
         get api('/users/999999/keys', admin)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
@@ -426,14 +426,14 @@ describe API::API, api: true  do
         user.keys << key
         user.save
         get api("/users/#{user.id}/keys", admin)
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['title']).to eq(key.title)
       end
 
       it "should return 405 for invalid ID" do
         get api("/users/ASDF/keys", admin)
-        expect(response.status).to eq(405)
+        expect(response).to have_http_status(405)
       end
     end
   end
@@ -444,7 +444,7 @@ describe API::API, api: true  do
     context 'when unauthenticated' do
       it 'should return authentication error' do
         delete api("/users/#{user.id}/keys/42")
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
@@ -455,20 +455,20 @@ describe API::API, api: true  do
         expect do
           delete api("/users/#{user.id}/keys/#{key.id}", admin)
         end.to change { user.keys.count }.by(-1)
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
       end
 
       it 'should return 404 error if user not found' do
         user.keys << key
         user.save
         delete api("/users/999999/keys/#{key.id}", admin)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'should return 404 error if key not foud' do
         delete api("/users/#{user.id}/keys/42", admin)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
         expect(json_response['message']).to eq('404 Key Not Found')
       end
     end
@@ -479,7 +479,7 @@ describe API::API, api: true  do
 
     it "should not create invalid email" do
       post api("/users/#{user.id}/emails", admin), {}
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']).to eq('400 (Bad request) "email" not given')
     end
 
@@ -492,7 +492,7 @@ describe API::API, api: true  do
 
     it "should raise error for invalid ID" do
       post api("/users/ASDF/emails", admin)
-      expect(response.status).to eq(405)
+      expect(response).to have_http_status(405)
     end
   end
 
@@ -502,14 +502,14 @@ describe API::API, api: true  do
     context 'when unauthenticated' do
       it 'should return authentication error' do
         get api("/users/#{user.id}/emails")
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
     context 'when authenticated' do
       it 'should return 404 for non-existing user' do
         get api('/users/999999/emails', admin)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
@@ -517,14 +517,14 @@ describe API::API, api: true  do
         user.emails << email
         user.save
         get api("/users/#{user.id}/emails", admin)
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['email']).to eq(email.email)
       end
 
       it "should raise error for invalid ID" do
         put api("/users/ASDF/emails", admin)
-        expect(response.status).to eq(405)
+        expect(response).to have_http_status(405)
       end
     end
   end
@@ -535,7 +535,7 @@ describe API::API, api: true  do
     context 'when unauthenticated' do
       it 'should return authentication error' do
         delete api("/users/#{user.id}/emails/42")
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
@@ -546,20 +546,20 @@ describe API::API, api: true  do
         expect do
           delete api("/users/#{user.id}/emails/#{email.id}", admin)
         end.to change { user.emails.count }.by(-1)
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(200)
       end
 
       it 'should return 404 error if user not found' do
         user.emails << email
         user.save
         delete api("/users/999999/emails/#{email.id}", admin)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'should return 404 error if email not foud' do
         delete api("/users/#{user.id}/emails/42", admin)
-        expect(response.status).to eq(404)
+        expect(response).to have_http_status(404)
         expect(json_response['message']).to eq('404 Email Not Found')
       end
 
@@ -574,24 +574,24 @@ describe API::API, api: true  do
 
     it "should delete user" do
       delete api("/users/#{user.id}", admin)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect { User.find(user.id) }.to raise_error ActiveRecord::RecordNotFound
       expect(json_response['email']).to eq(user.email)
     end
 
     it "should not delete for unauthenticated user" do
       delete api("/users/#{user.id}")
-      expect(response.status).to eq(401)
+      expect(response).to have_http_status(401)
     end
 
     it "shouldn't available for non admin users" do
       delete api("/users/#{user.id}", user)
-      expect(response.status).to eq(403)
+      expect(response).to have_http_status(403)
     end
 
     it "should return 404 for non-existing user" do
       delete api("/users/999999", admin)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
@@ -603,7 +603,7 @@ describe API::API, api: true  do
   describe "GET /user" do
     it "should return current user" do
       get api("/user", user)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response['email']).to eq(user.email)
       expect(json_response['is_admin']).to eq(user.is_admin?)
       expect(json_response['can_create_project']).to eq(user.can_create_project?)
@@ -613,7 +613,7 @@ describe API::API, api: true  do
 
     it "should return 401 error if user is unauthenticated" do
       get api("/user")
-      expect(response.status).to eq(401)
+      expect(response).to have_http_status(401)
     end
   end
 
@@ -621,7 +621,7 @@ describe API::API, api: true  do
     context "when unauthenticated" do
       it "should return authentication error" do
         get api("/user/keys")
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
@@ -630,7 +630,7 @@ describe API::API, api: true  do
         user.keys << key
         user.save
         get api("/user/keys", 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["title"]).to eq(key.title)
       end
@@ -642,13 +642,13 @@ describe API::API, api: true  do
       user.keys << key
       user.save
       get api("/user/keys/#{key.id}", user)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response["title"]).to eq(key.title)
     end
 
     it "should return 404 Not Found within invalid ID" do
       get api("/user/keys/42", user)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
 
@@ -657,13 +657,13 @@ describe API::API, api: true  do
       user.save
       admin
       get api("/user/keys/#{key.id}", admin)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
 
     it "should return 404 for invalid ID" do
       get api("/users/keys/ASDF", admin)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
     end
   end
 
@@ -673,29 +673,29 @@ describe API::API, api: true  do
       expect do
         post api("/user/keys", user), key_attrs
       end.to change{ user.keys.count }.by(1)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
     end
 
     it "should return a 401 error if unauthorized" do
       post api("/user/keys"), title: 'some title', key: 'some key'
-      expect(response.status).to eq(401)
+      expect(response).to have_http_status(401)
     end
 
     it "should not create ssh key without key" do
       post api("/user/keys", user), title: 'title'
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']).to eq('400 (Bad request) "key" not given')
     end
 
     it 'should not create ssh key without title' do
       post api('/user/keys', user), key: 'some key'
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']).to eq('400 (Bad request) "title" not given')
     end
 
     it "should not create ssh key without title" do
       post api("/user/keys", user), key: "somekey"
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
     end
   end
 
@@ -706,19 +706,19 @@ describe API::API, api: true  do
       expect do
         delete api("/user/keys/#{key.id}", user)
       end.to change{user.keys.count}.by(-1)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
     end
 
     it "should return success if key ID not found" do
       delete api("/user/keys/42", user)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
     end
 
     it "should return 401 error if unauthorized" do
       user.keys << key
       user.save
       delete api("/user/keys/#{key.id}")
-      expect(response.status).to eq(401)
+      expect(response).to have_http_status(401)
     end
 
     it "should raise error for invalid ID" do
@@ -730,7 +730,7 @@ describe API::API, api: true  do
     context "when unauthenticated" do
       it "should return authentication error" do
         get api("/user/emails")
-        expect(response.status).to eq(401)
+        expect(response).to have_http_status(401)
       end
     end
 
@@ -739,7 +739,7 @@ describe API::API, api: true  do
         user.emails << email
         user.save
         get api("/user/emails", 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["email"]).to eq(email.email)
       end
@@ -751,13 +751,13 @@ describe API::API, api: true  do
       user.emails << email
       user.save
       get api("/user/emails/#{email.id}", user)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(json_response["email"]).to eq(email.email)
     end
 
     it "should return 404 Not Found within invalid ID" do
       get api("/user/emails/42", user)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
 
@@ -766,13 +766,13 @@ describe API::API, api: true  do
       user.save
       admin
       get api("/user/emails/#{email.id}", admin)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
 
     it "should return 404 for invalid ID" do
       get api("/users/emails/ASDF", admin)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
     end
   end
 
@@ -782,17 +782,17 @@ describe API::API, api: true  do
       expect do
         post api("/user/emails", user), email_attrs
       end.to change{ user.emails.count }.by(1)
-      expect(response.status).to eq(201)
+      expect(response).to have_http_status(201)
     end
 
     it "should return a 401 error if unauthorized" do
       post api("/user/emails"), email: 'some email'
-      expect(response.status).to eq(401)
+      expect(response).to have_http_status(401)
     end
 
     it "should not create email with invalid email" do
       post api("/user/emails", user), {}
-      expect(response.status).to eq(400)
+      expect(response).to have_http_status(400)
       expect(json_response['message']).to eq('400 (Bad request) "email" not given')
     end
   end
@@ -804,19 +804,19 @@ describe API::API, api: true  do
       expect do
         delete api("/user/emails/#{email.id}", user)
       end.to change{user.emails.count}.by(-1)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
     end
 
     it "should return success if email ID not found" do
       delete api("/user/emails/42", user)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
     end
 
     it "should return 401 error if unauthorized" do
       user.emails << email
       user.save
       delete api("/user/emails/#{email.id}")
-      expect(response.status).to eq(401)
+      expect(response).to have_http_status(401)
     end
 
     it "should raise error for invalid ID" do
@@ -828,25 +828,25 @@ describe API::API, api: true  do
     before { admin }
     it 'should block existing user' do
       put api("/users/#{user.id}/block", admin)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(user.reload.state).to eq('blocked')
     end
 
     it 'should not re-block ldap blocked users' do
       put api("/users/#{ldap_blocked_user.id}/block", admin)
-      expect(response.status).to eq(403)
+      expect(response).to have_http_status(403)
       expect(ldap_blocked_user.reload.state).to eq('ldap_blocked')
     end
 
     it 'should not be available for non admin users' do
       put api("/users/#{user.id}/block", user)
-      expect(response.status).to eq(403)
+      expect(response).to have_http_status(403)
       expect(user.reload.state).to eq('active')
     end
 
     it 'should return a 404 error if user id not found' do
       put api('/users/9999/block', admin)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
   end
@@ -857,31 +857,31 @@ describe API::API, api: true  do
 
     it 'should unblock existing user' do
       put api("/users/#{user.id}/unblock", admin)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(user.reload.state).to eq('active')
     end
 
     it 'should unblock a blocked user' do
       put api("/users/#{blocked_user.id}/unblock", admin)
-      expect(response.status).to eq(200)
+      expect(response).to have_http_status(200)
       expect(blocked_user.reload.state).to eq('active')
     end
 
     it 'should not unblock ldap blocked users' do
       put api("/users/#{ldap_blocked_user.id}/unblock", admin)
-      expect(response.status).to eq(403)
+      expect(response).to have_http_status(403)
       expect(ldap_blocked_user.reload.state).to eq('ldap_blocked')
     end
 
     it 'should not be available for non admin users' do
       put api("/users/#{user.id}/unblock", user)
-      expect(response.status).to eq(403)
+      expect(response).to have_http_status(403)
       expect(user.reload.state).to eq('active')
     end
 
     it 'should return a 404 error if user id not found' do
       put api('/users/9999/block', admin)
-      expect(response.status).to eq(404)
+      expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end