Commit 8f333bbc049662d8e9344ec5b3964e53c6828915

Authored by Evandro Junior
2 parents 406255f3 f4c57c01

Merge branch 'api_captcha_with_frontend_console_feedback' into api

* api_captcha_with_frontend_console_feedback:
  Fix user messages
lib/noosfero/api/helpers.rb
... ... @@ -273,7 +273,7 @@ require 'grape'
273 273 if javascript_console_message.present?
274 274 error!(message_hash, status)
275 275 else
276   - error!(user_message, status)
  276 + error!({'message' => user_message, :code => status}, status)
277 277 end
278 278 end
279 279  
... ...
test/unit/api/users_test.rb
... ... @@ -29,7 +29,7 @@ class UsersTest < ActiveSupport::TestCase
29 29 params[:user] = {:login => 'some', :password => '123456', :password_confirmation => '123456', :email => 'some@some.com'}
30 30 post "/api/v1/users?#{params.to_query}"
31 31 json = JSON.parse(last_response.body)
32   - assert_equal 'Username / Email já está em uso,e-Mail já está em uso', json['error']
  32 + assert_equal 'Username / Email já está em uso,e-Mail já está em uso', json['message']
33 33 end
34 34  
35 35 should 'return 400 status for invalid user creation' do
... ...