Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixes a bug in handling "Spam detected" messages #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NARKOZ merged 2 commits into from
Nov 6, 2018
Merged

Fixes a bug in handling "Spam detected" messages #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52aabeb
Fixes a bug in handling "Spam detected" messages
halfbyte Nov 6, 2018
131c204
fix linter error
halfbyte Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/gitlab/error.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def handle_message(message)
case message
when Gitlab::ObjectifiedHash
message.to_h.sort.map do |key, val|
"'#{key}' #{(val.is_a?(Hash) ? val.sort.map { |k, v| "(#{k}: #{v.join(' ')})" } : val).join(' ')}"
"'#{key}' #{(val.is_a?(Hash) ? val.sort.map { |k, v| "(#{k}: #{v.join(' ')})" } : [val].flatten).join(' ')}"
end.join(', ')
when Array
message.join(' ')
Expand Down
7 changes: 5 additions & 2 deletions spec/gitlab/error_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
%r{Server responded with code \d+, message: Displayed error_description. Request URI: https://gitlab.com/api/v3/foo},
%r{Server responded with code \d+, message: Displayed error. Request URI: https://gitlab.com/api/v3/foo},
%r{Server responded with code \d+, message: 'embed_entity' \(foo: bar\) \(sna: fu\), 'password' too short. Request URI: https://gitlab.com/api/v3/foo},
%r{Server responded with code \d+, message: First message. Second message.. Request URI: https://gitlab.com/api/v3/foo}
%r{Server responded with code \d+, message: First message. Second message.. Request URI: https://gitlab.com/api/v3/foo},
%r{Server responded with code \d+, message: 'error' Spam detected. Request URI: https://gitlab.com/api/v3/foo}
]
end

Expand All @@ -23,7 +24,9 @@
{ code: 404, parsed_response: Gitlab::ObjectifiedHash.new(error_description: 'Displayed error_description', error: 'also will not be displayed') },
{ code: 401, parsed_response: Gitlab::ObjectifiedHash.new(error: 'Displayed error') },
{ code: 500, parsed_response: Gitlab::ObjectifiedHash.new(embed_entity: { foo: ['bar'], sna: ['fu'] }, password: ['too short']) },
{ code: 403, parsed_response: Array.new(['First message.', 'Second message.']) }
{ code: 403, parsed_response: Array.new(['First message.', 'Second message.']) },
{ code: 400, parsed_response: Gitlab::ObjectifiedHash.new(message: { error: 'Spam detected' }) }

].each_with_index do |data, index|
it 'returns the expected message' do
response_double = double(**data, request: @request_double)
Expand Down