From d7b3b82d9b3671a340b41e3449e456bd3b7e9822 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Sun, 15 Mar 2015 23:12:16 -0300 Subject: [PATCH] adding helper teste --- lib/api/helpers.rb | 2 +- lib/api/v1/articles.rb | 5 +---- test/unit/api/helpers_test.rb | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 test/unit/api/helpers_test.rb diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 61b2dbc..548bcae 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -7,7 +7,7 @@ module API end def current_user - private_token = params[PRIVATE_TOKEN_PARAM].to_s + private_token = params[PRIVATE_TOKEN_PARAM].to_s if params @current_user ||= User.find_by_private_token(private_token) @current_user = nil if !@current_user.nil? && @current_user.private_token_expired? @current_user diff --git a/lib/api/v1/articles.rb b/lib/api/v1/articles.rb index 80fb6b1..74c1ec6 100644 --- a/lib/api/v1/articles.rb +++ b/lib/api/v1/articles.rb @@ -13,10 +13,7 @@ module API # limit - amount of articles returned. The default value is 20 # # Example Request: - # GET http://localhost:3000/api/v1/articles?from=2013-04-04-14:41:43&until=2015-04-04-14:41:43&limit=10&private_token=e96fff37c2238fdab074d1dcea8e6317 -# desc 'Articles.', { -# :params => API::Entities::Article.documentation -# } + # GET host/api/v1/articles?from=2013-04-04-14:41:43&until=2015-04-04-14:41:43&limit=10&private_token=e96fff37c2238fdab074d1dcea8e6317 get do articles = select_filtered_collection_of(environment, 'articles', params) articles = articles.display_filter(current_user.person, nil) diff --git a/test/unit/api/helpers_test.rb b/test/unit/api/helpers_test.rb new file mode 100644 index 0000000..debb838 --- /dev/null +++ b/test/unit/api/helpers_test.rb @@ -0,0 +1,48 @@ +require File.dirname(__FILE__) + '/test_helper' + +class APITest < ActiveSupport::TestCase + + include API::APIHelpers + +# def setup +# login_api +# end + + should 'get the current user' do + user = create_user('someuser') +# params = {:private_token => user.private_token} +# post "/api/v1/login?#{params.to_query}" +# json = JSON.parse(last_response.body) + User.expects(:find_by_private_token).returns(user) + assert_equal user, current_user +# +# assert !json["private_token"].blank? + end + +# should 'return 401 when login fails' do +# user.destroy +# params = {:login => "testapi", :password => "testapi"} +# post "/api/v1/login?#{params.to_query}" +# assert_equal 401, last_response.status +# end +# +# should 'register a user' do +# params = {:login => "newuserapi", :password => "newuserapi", :email => "newuserapi@email.com" } +# post "/api/v1/register?#{params.to_query}" +# assert_equal 201, last_response.status +# end +# +# should 'do not register a user without email' do +# params = {:login => "newuserapi", :password => "newuserapi", :email => nil } +# post "/api/v1/register?#{params.to_query}" +# assert_equal 400, last_response.status +# end +# +# should 'do not register a duplicated user' do +# params = {:login => "newuserapi", :password => "newuserapi", :email => "newuserapi@email.com" } +# post "/api/v1/register?#{params.to_query}" +# post "/api/v1/register?#{params.to_query}" +# assert_equal 400, last_response.status +# end +# +end -- libgit2 0.21.2