From 838caf490a9b29736d9199d3b3931f208113e841 Mon Sep 17 00:00:00 2001 From: Evandro Junior Date: Sat, 25 Jul 2015 09:59:35 -0300 Subject: [PATCH] All tests fixed --- lib/noosfero/api/session.rb | 8 +++----- test/unit/api/session_test.rb | 9 ++------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/noosfero/api/session.rb b/lib/noosfero/api/session.rb index 7acbfb7..4503910 100644 --- a/lib/noosfero/api/session.rb +++ b/lib/noosfero/api/session.rb @@ -39,7 +39,9 @@ module Noosfero unique_attributes! User, [:email, :login] attrs = attributes_for_keys [:email, :login, :password, :password_confirmation] + environment.signup_person_fields remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR']) - test_captcha(remote_ip, params, environment) + # test_captcha will render_api_error! and exit in case of some problem + # this return is only improve the clarity of the execution path + return unless test_captcha(remote_ip, params, environment) user = User.new(attrs) if user.save user.generate_private_token! if user.activated? @@ -124,10 +126,6 @@ module Noosfero end end - get "/stop" do - stop!("show on screen", 400, "this is the log message", "go to JS") - end - end end end diff --git a/test/unit/api/session_test.rb b/test/unit/api/session_test.rb index 4d342e4..8d03a0e 100644 --- a/test/unit/api/session_test.rb +++ b/test/unit/api/session_test.rb @@ -64,8 +64,8 @@ class SessionTest < ActiveSupport::TestCase params = {:login => "newuserapi", :password => "newuserapi", :password_confirmation => "newuserapi", :email => "newuserapi@email.com", :txtToken_captcha_serpro_gov_br => '4324343', :captcha_text => '4030320'} post "/api/v1/register?#{params.to_query}" - message = JSON.parse(last_response.body)['message'] - assert_equal "Serpro captcha error: getaddrinfo: Name or service not known", JSON.parse(message)['javascript_console_message'] + message = JSON.parse(last_response.body)['javascript_console_message'] + assert_equal "Serpro captcha error: getaddrinfo: Name or service not known", message end # TODO: Add another test cases to check register situations @@ -161,9 +161,4 @@ class SessionTest < ActiveSupport::TestCase assert_equal 404, last_response.status end - should 'show erro' do - post "/api/v1/error" - puts last_response.inspect - end - end -- libgit2 0.21.2