Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
24015ef0
Unverified
Commit
24015ef0
authored
1 year ago
by
Daniel M Brasil
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Migrate to request specs in `/api/v1/domain_blocks` (#25414)
parent
87aff5aa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
spec/controllers/api/v1/domain_blocks_controller_spec.rb
+0
-69
0 additions, 69 deletions
spec/controllers/api/v1/domain_blocks_controller_spec.rb
spec/requests/api/v1/domain_blocks_spec.rb
+125
-0
125 additions, 0 deletions
spec/requests/api/v1/domain_blocks_spec.rb
with
125 additions
and
69 deletions
spec/controllers/api/v1/domain_blocks_controller_spec.rb
deleted
100644 → 0
+
0
−
69
View file @
87aff5aa
# 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
This diff is collapsed.
Click to expand it.
spec/requests/api/v1/domain_blocks_spec.rb
0 → 100644
+
125
−
0
View file @
24015ef0
# 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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment