Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
9d08d127
Commit
9d08d127
authored
2 years ago
by
Eugen Rochko
Browse files
Options
Download
Email Patches
Plain Diff
Change `POST /api/v1/admin/domain_blocks` to be consistent with other APIs
parent
1d261c7c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/controllers/admin/domain_blocks_controller.rb
+2
-6
app/controllers/admin/domain_blocks_controller.rb
app/controllers/api/v1/admin/domain_blocks_controller.rb
+4
-7
app/controllers/api/v1/admin/domain_blocks_controller.rb
spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb
+1
-6
...controllers/api/v1/admin/domain_blocks_controller_spec.rb
with
7 additions
and
19 deletions
+7
-19
app/controllers/admin/domain_blocks_controller.rb
+
2
-
6
View file @
9d08d127
...
...
@@ -43,12 +43,8 @@ module Admin
def
update
authorize
:domain_block
,
:update?
@domain_block
.
update
(
update_params
)
severity_changed
=
@domain_block
.
severity_changed?
if
@domain_block
.
save
DomainBlockWorker
.
perform_async
(
@domain_block
.
id
,
severity_changed
)
if
@domain_block
.
update
(
update_params
)
DomainBlockWorker
.
perform_async
(
@domain_block
.
id
,
@domain_block
.
severity_previously_changed?
)
log_action
:update
,
@domain_block
redirect_to
admin_instances_path
(
limited:
'1'
),
notice:
I18n
.
t
(
'admin.domain_blocks.created_msg'
)
else
...
...
This diff is collapsed.
Click to expand it.
app/controllers/api/v1/admin/domain_blocks_controller.rb
+
4
-
7
View file @
9d08d127
...
...
@@ -19,12 +19,10 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
def
create
authorize
:domain_block
,
:create?
existing_domain_block
=
resource_params
[
:domain
].
present?
?
DomainBlock
.
rule_for
(
resource_params
[
:domain
])
:
nil
return
render
json:
existing_domain_block
,
serializer:
REST
::
Admin
::
ExistingDomainBlockErrorSerializer
,
status:
422
if
existing_domain_block
.
present?
@domain_block
=
DomainBlock
.
create!
(
resource_params
)
DomainBlockWorker
.
perform_async
(
@domain_block
.
id
)
log_action
:create
,
@domain_block
render
json:
@domain_block
,
serializer:
REST
::
Admin
::
DomainBlockSerializer
end
...
...
@@ -41,11 +39,10 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
def
update
authorize
@domain_block
,
:update?
@domain_block
.
update
(
domain_block_params
)
severity_changed
=
@domain_block
.
severity_changed?
@domain_block
.
save!
DomainBlockWorker
.
perform_async
(
@domain_block
.
id
,
severity_changed
)
@domain_block
.
update!
(
domain_block_params
)
DomainBlockWorker
.
perform_async
(
@domain_block
.
id
,
@domain_block
.
severity_previously_changed?
)
log_action
:update
,
@domain_block
render
json:
@domain_block
,
serializer:
REST
::
Admin
::
DomainBlockSerializer
end
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb
+
1
-
6
View file @
9d08d127
...
...
@@ -117,16 +117,11 @@ RSpec.describe Api::V1::Admin::DomainBlocksController, type: :controller do
end
context
'when a stricter domain block already exists'
do
let
(
:existing_block_domain
)
{
'bar.com'
}
let
(
:existing_block_domain
)
{
'
foo.
bar.com'
}
it
'returns http unprocessable entity'
do
expect
(
response
).
to
have_http_status
(
422
)
end
it
'renders existing domain block in error'
do
json
=
body_as_json
expect
(
json
[
:existing_domain_block
][
:domain
]).
to
eq
existing_block_domain
end
end
end
end
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets