Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
403c566a67a8
Commit
86ef67ee
authored
Mar 20, 2017
by
Oswaldo Ferreira
Browse files
Present ajax call errors when failing to update an Issue
parent
0835854ddf0f
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/issues_controller.rb
View file @
403c566a
...
...
@@ -148,7 +148,14 @@ def update
end
format
.
json
do
render
json:
@issue
.
to_json
(
include:
{
milestone:
{},
assignee:
{
only:
[
:name
,
:username
],
methods:
[
:avatar_url
]
},
labels:
{
methods: :text_color
}
},
methods:
[
:task_status
,
:task_status_short
])
if
@issue
.
valid?
render
json:
@issue
.
to_json
(
methods:
[
:task_status
,
:task_status_short
],
include:
{
milestone:
{},
assignee:
{
only:
[
:name
,
:username
],
methods:
[
:avatar_url
]
},
labels:
{
methods: :text_color
}
})
else
render
json:
{
errors:
@issue
.
errors
.
full_messages
},
status: :unprocessable_entity
end
end
end
...
...
app/models/concerns/spammable.rb
View file @
403c566a
...
...
@@ -41,7 +41,7 @@ def spam?
def
check_for_spam
error_msg
=
if
Gitlab
::
Recaptcha
.
enabled?
"Your
#{
spammable_entity_type
}
has been recognized as spam. "
\
"
You
can
still submit it by solving Captcha
."
"
Please,
c
h
an
ge the content or solve the reCAPTCHA to proceed
."
else
"Your
#{
spammable_entity_type
}
has been recognized as spam and has been discarded."
end
...
...
spec/controllers/projects/issues_controller_spec.rb
View file @
403c566a
...
...
@@ -241,10 +241,27 @@ def update_spam_issue
expect
(
spam_logs
.
first
.
recaptcha_verified
).
to
be_falsey
end
it
'renders verify template'
do
update_spam_issue
context
'as HTML'
do
it
'renders verify template'
do
update_spam_issue
expect
(
response
).
to
render_template
(
:verify
)
end
end
context
'as JSON'
do
before
do
update_issue
({
title:
'Spam Title'
,
description:
'Spam lives here'
},
format: :json
)
end
it
'renders json errors'
do
expect
(
json_response
)
.
to
eql
(
"errors"
=>
[
"Your issue has been recognized as spam. Please, change the content or solve the reCAPTCHA to proceed."
])
end
expect
(
response
).
to
render_template
(
:verify
)
it
'returns 422 status'
do
expect
(
response
).
to
have_http_status
(
422
)
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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