needs to fix tests

Evandro Junior
1 parent 9dd96d50
Showing 3 changed files with 16 additions and 27 deletions Show diff stats
lib/noosfero/api/api.rb
lib/noosfero/api/helpers.rb
test/unit/api/helpers_test.rb
@@ -11,9 +11,9 @@ module Noosfero
       logger.formatter = GrapeLogging::Formatters::Default.new
       use GrapeLogging::Middleware::RequestLogger, { logger: logger }
  
-      #rescue_from :all do |e|
-      #  logger.error e
-      #end
+      rescue_from :all do |e|
+        logger.error e
+      end
  
       @@NOOSFERO_CONF = nil
       def self.NOOSFERO_CONF
@@ -204,20 +204,6 @@ require &#39;grape&#39;
         attrs
       end
  
-      def verify_recaptcha_v2(remote_ip, g_recaptcha_response, private_key, api_recaptcha_verify_uri)
-        verify_hash = {
-          "secret"    => private_key,
-          "remoteip"  => remote_ip,
-          "response"  => g_recaptcha_response
-        }
-        uri = URI(api_recaptcha_verify_uri)
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl = true
-        request = Net::HTTP::Post.new(uri.path)
-        request.set_form_data(verify_hash)
-        JSON.parse(https.request(request).body)
-      end
-
       ##########################################
       #              error helpers             #
       ##########################################
@@ -255,14 +241,14 @@ require &#39;grape&#39;
  
       # javascript_console_message is supposed to be executed as console.log()
       def render_api_error!(user_message, status, log_message = nil, javascript_console_message = nil)
-        status = status(status || namespace_inheritable(:default_error_status))
+        status||= 400
         message_hash = {'message' => user_message, :code => status}
         message_hash[:javascript_console_message] = javascript_console_message if javascript_console_message.present?
         log_msg = "#{status}, User message: #{user_message}"
         log_msg = "#{log_message}, #{log_msg}" if log_message.present?
         log_msg = "#{log_msg}, Javascript Console Message: #{javascript_console_message}" if javascript_console_message.present?
-        #Since throw :error is not logging the errors I had to manually add log it!
-        log(log_msg)
+        #Since throw :error is not logging the errors I had to manually log it!
+        #log(log_msg)
         throw :error, message: message_hash, status: status, headers: headers
       end
  
@@ -247,8 +247,11 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     params = {}
     params[:txtToken_captcha_serpro_gov_br] = '4324343'
     params[:captcha_text] = '4324343'
-    r = test_captcha('127.0.0.1', params, environment)
-    assert_equal 'Serpro captcha error: getaddrinfo: Name or service not known', JSON.parse(r)['console_message']
+    assert_throws :error do
+      r =      test_captcha('127.0.0.1', params, environment)
+      puts r.inspect
+    end
+    # assert_equal 'Serpro captcha error: getaddrinfo: Name or service not known', JSON.parse(r)['console_message']
   end
  
  
@@ -260,11 +263,11 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
   # end
  
  
-  should 'display user message' do
-    r=render_api_error!('Error to the user', '403', 'detailed log_message', 'show this on user\'s javascript console')
-    puts r.inspect
-    tsil
-  end
+  # should 'display user message' do
+  #   r=render_api_error!('Error to the user', '403', 'detailed log_message', 'show this on user\'s javascript console')
+  #   puts r.inspect
+  #   tsil
+  # end
  
   protected
...	...	@@ -11,9 +11,9 @@ module Noosfero
11	11	logger.formatter = GrapeLogging::Formatters::Default.new
12	12	use GrapeLogging::Middleware::RequestLogger, { logger: logger }
13	13
14		- #rescue_from :all do \|e\|
15		- # logger.error e
16		- #end
	14	+ rescue_from :all do \|e\|
	15	+ logger.error e
	16	+ end
17	17
18	18	@@NOOSFERO_CONF = nil
19	19	def self.NOOSFERO_CONF
...	...
...	...	@@ -204,20 +204,6 @@ require 'grape'
204	204	attrs
205	205	end
206	206
207		- def verify_recaptcha_v2(remote_ip, g_recaptcha_response, private_key, api_recaptcha_verify_uri)
208		- verify_hash = {
209		- "secret" => private_key,
210		- "remoteip" => remote_ip,
211		- "response" => g_recaptcha_response
212		- }
213		- uri = URI(api_recaptcha_verify_uri)
214		- https = Net::HTTP.new(uri.host, uri.port)
215		- https.use_ssl = true
216		- request = Net::HTTP::Post.new(uri.path)
217		- request.set_form_data(verify_hash)
218		- JSON.parse(https.request(request).body)
219		- end
220		-
221	207	##########################################
222	208	# error helpers #
223	209	##########################################
...	...	@@ -255,14 +241,14 @@ require 'grape'
255	241
256	242	# javascript_console_message is supposed to be executed as console.log()
257	243	def render_api_error!(user_message, status, log_message = nil, javascript_console_message = nil)
258		- status = status(status \|\| namespace_inheritable(:default_error_status))
	244	+ status\|\|= 400
259	245	message_hash = {'message' => user_message, :code => status}
260	246	message_hash[:javascript_console_message] = javascript_console_message if javascript_console_message.present?
261	247	log_msg = "#{status}, User message: #{user_message}"
262	248	log_msg = "#{log_message}, #{log_msg}" if log_message.present?
263	249	log_msg = "#{log_msg}, Javascript Console Message: #{javascript_console_message}" if javascript_console_message.present?
264		- #Since throw :error is not logging the errors I had to manually add log it!
265		- log(log_msg)
	250	+ #Since throw :error is not logging the errors I had to manually log it!
	251	+ #log(log_msg)
266	252	throw :error, message: message_hash, status: status, headers: headers
267	253	end
268	254
...	...
...	...	@@ -247,8 +247,11 @@ class APIHelpersTest < ActiveSupport::TestCase
247	247	params = {}
248	248	params[:txtToken_captcha_serpro_gov_br] = '4324343'
249	249	params[:captcha_text] = '4324343'
250		- r = test_captcha('127.0.0.1', params, environment)
251		- assert_equal 'Serpro captcha error: getaddrinfo: Name or service not known', JSON.parse(r)['console_message']
	250	+ assert_throws :error do
	251	+ r = test_captcha('127.0.0.1', params, environment)
	252	+ puts r.inspect
	253	+ end
	254	+ # assert_equal 'Serpro captcha error: getaddrinfo: Name or service not known', JSON.parse(r)['console_message']
252	255	end
253	256
254	257
...	...	@@ -260,11 +263,11 @@ class APIHelpersTest < ActiveSupport::TestCase
260	263	# end
261	264
262	265
263		- should 'display user message' do
264		- r=render_api_error!('Error to the user', '403', 'detailed log_message', 'show this on user\'s javascript console')
265		- puts r.inspect
266		- tsil
267		- end
	266	+ # should 'display user message' do
	267	+ # r=render_api_error!('Error to the user', '403', 'detailed log_message', 'show this on user\'s javascript console')
	268	+ # puts r.inspect
	269	+ # tsil
	270	+ # end
268	271
269	272	protected
270	273
...	...