All tests fixed

Evandro Junior
1 parent 1d5fb8d9
Showing 2 changed files with 5 additions and 12 deletions Show diff stats
lib/noosfero/api/session.rb
test/unit/api/session_test.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
@@ -64,8 +64,8 @@ class SessionTest &lt; 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 &lt; ActiveSupport::TestCase
     assert_equal 404, last_response.status
   end
-  should 'show erro' do
-    post "/api/v1/error"
-    puts last_response.inspect
-  end
-
 end