Download as
Browse Code »

Commit 85dc60d0cd4fa9b2cc9982bfea53c6381ec3a7f3

Authored by Evandro Junior
2 parents 339d789c efa42e96
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'api_captcha_with_frontend_console_feedback' into api

Showing 2 changed files with 5 additions and 7 deletions   Show diff stats
lib/noosfero/api/helpers.rb
  Diff comments   View file @85dc60d
... ... @@ -40,7 +40,9 @@ require 'grape'
40 40 end
41 41  
42 42 def logger
43   - Noosfero::API::API.logger
  43 + logger = Logger.new(File.join(Rails.root, 'log', "#{ENV['RAILS_ENV'] || 'production'}_api.log"))
  44 + logger.formatter = GrapeLogging::Formatters::Default.new
  45 + logger
44 46 end
45 47  
46 48 def limit
... ... @@ -270,11 +272,7 @@ require 'grape'
270 272 log_msg = "#{log_message}, #{log_msg}" if log_message.present?
271 273 log_msg = "#{log_msg}, Javascript Console Message: #{javascript_console_message}" if javascript_console_message.present?
272 274 logger.error log_msg unless Rails.env.test?
273   - if javascript_console_message.present?
274   - error!(message_hash, status)
275   - else
276   - error!({'message' => user_message, :code => status}, status)
277   - end
  275 + error!(message_hash, status)
278 276 end
279 277  
280 278 def render_api_errors!(messages)
... ...
test/unit/api/helpers_test.rb
  Diff comments   View file @85dc60d
... ... @@ -296,7 +296,7 @@ should 'captcha serpro say name or service not known' do
296 296 params[:txtToken_captcha_serpro_gov_br] = '4324343'
297 297 params[:captcha_text] = '4324343'
298 298 r = test_captcha('127.0.0.1', params, environment)
299   - assert_equal(_("Serpro captcha error: getaddrinfo: Name or service not known"), r[0][:javascript_console_message])
  299 + assert (r[0][:javascript_console_message]).starts_with?("Serpro captcha error: getaddrinfo")
300 300 end
301 301  
302 302 ###### END Captcha tests ######
... ...