From 24015ef0cc84e7caffc4c02b9b7d5cdbdeb80002 Mon Sep 17 00:00:00 2001
From: Daniel M Brasil <danielmbrasil@protonmail.com>
Date: Wed, 14 Jun 2023 11:08:53 -0300
Subject: [PATCH] Migrate to request specs in `/api/v1/domain_blocks` (#25414)
---
.../api/v1/domain_blocks_controller_spec.rb | 69 ----------
spec/requests/api/v1/domain_blocks_spec.rb | 125 ++++++++++++++++++
2 files changed, 125 insertions(+), 69 deletions(-)
delete mode 100644 spec/controllers/api/v1/domain_blocks_controller_spec.rb
create mode 100644 spec/requests/api/v1/domain_blocks_spec.rb
diff --git a/spec/controllers/api/v1/domain_blocks_controller_spec.rb b/spec/controllers/api/v1/domain_blocks_controller_spec.rb
deleted file mode 100644
index 20b2909e63..0000000000
--- a/spec/controllers/api/v1/domain_blocks_controller_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::DomainBlocksController do
- render_views
-
- let(:user) { Fabricate(:user) }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-
- before do
- user.account.block_domain!('example.com')
- allow(controller).to receive(:doorkeeper_token) { token }
- end
-
- describe 'GET #show' do
- let(:scopes) { 'read:blocks' }
-
- before do
- get :show, params: { limit: 1 }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
-
- it 'returns blocked domains' do
- expect(body_as_json.first).to eq 'example.com'
- end
-
- it_behaves_like 'forbidden for wrong scope', 'write:statuses'
- end
-
- describe 'POST #create' do
- let(:scopes) { 'write:blocks' }
-
- before do
- post :create, params: { domain: 'example.org' }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
-
- it 'creates a domain block' do
- expect(user.account.domain_blocking?('example.org')).to be true
- end
-
- it_behaves_like 'forbidden for wrong scope', 'write:statuses'
- end
-
- describe 'DELETE #destroy' do
- let(:scopes) { 'write:blocks' }
-
- before do
- delete :destroy, params: { domain: 'example.com' }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
-
- it 'deletes a domain block' do
- expect(user.account.domain_blocking?('example.com')).to be false
- end
-
- it_behaves_like 'forbidden for wrong scope', 'write:statuses'
- end
-end
diff --git a/spec/requests/api/v1/domain_blocks_spec.rb b/spec/requests/api/v1/domain_blocks_spec.rb
new file mode 100644
index 0000000000..0f4fd4e90e
--- /dev/null
+++ b/spec/requests/api/v1/domain_blocks_spec.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Domain blocks' do
+ let(:user) { Fabricate(:user) }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:scopes) { 'read:blocks write:blocks' }
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+ describe 'GET /api/v1/domain_blocks' do
+ subject do
+ get '/api/v1/domain_blocks', headers: headers, params: params
+ end
+
+ let(:blocked_domains) { ['example.com', 'example.net', 'example.org', 'example.com.br'] }
+ let(:params) { {} }
+
+ before do
+ blocked_domains.each { |domain| user.account.block_domain!(domain) }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:blocks'
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+
+ it 'returns the domains blocked by the requesting user' do
+ subject
+
+ expect(body_as_json).to match_array(blocked_domains)
+ end
+
+ context 'with limit param' do
+ let(:params) { { limit: 2 } }
+
+ it 'returns only the requested number of blocked domains' do
+ subject
+
+ expect(body_as_json.size).to eq(params[:limit])
+ end
+ end
+ end
+
+ describe 'POST /api/v1/domain_blocks' do
+ subject do
+ post '/api/v1/domain_blocks', headers: headers, params: params
+ end
+
+ let(:params) { { domain: 'example.com' } }
+
+ it_behaves_like 'forbidden for wrong scope', 'read read:blocks'
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+
+ it 'creates a domain block' do
+ subject
+
+ expect(user.account.domain_blocking?(params[:domain])).to be(true)
+ end
+
+ context 'when no domain name is given' do
+ let(:params) { { domain: '' } }
+
+ it 'returns http unprocessable entity' do
+ subject
+
+ expect(response).to have_http_status(422)
+ end
+ end
+
+ context 'when the given domain name is invalid' do
+ let(:params) { { domain: 'example com' } }
+
+ it 'returns unprocessable entity' do
+ subject
+
+ expect(response).to have_http_status(422)
+ end
+ end
+ end
+
+ describe 'DELETE /api/v1/domain_blocks' do
+ subject do
+ delete '/api/v1/domain_blocks/', headers: headers, params: params
+ end
+
+ let(:params) { { domain: 'example.com' } }
+
+ before do
+ user.account.block_domain!('example.com')
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'read read:blocks'
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+
+ it 'deletes the specified domain block' do
+ subject
+
+ expect(user.account.domain_blocking?('example.com')).to be(false)
+ end
+
+ context 'when the given domain name is not blocked' do
+ let(:params) { { domain: 'example.org' } }
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+ end
+ end
+end
--
GitLab