From bec5bb47291d19953ffbc8ab9e701185d453df01 Mon Sep 17 00:00:00 2001 From: Mike Slemmer Date: Fri, 21 Dec 2012 22:32:24 -0800 Subject: [PATCH] fix tests --- app/controllers/api_users_controller.rb | 3 ++- app/helpers/sessions_helper.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/api_users_controller.rb b/app/controllers/api_users_controller.rb index e2058f221..44cd37679 100644 --- a/app/controllers/api_users_controller.rb +++ b/app/controllers/api_users_controller.rb @@ -93,7 +93,7 @@ class ApiUsersController < ApiController rescue JamRuby::JamArgumentError render :json => { :message => ValidationMessages::OLD_PASSWORD_DOESNT_MATCH }, :status => 403 end - set_remember_token + set_remember_token(@user) respond_with responder: ApiResponder, :status => 204 end @@ -114,6 +114,7 @@ class ApiUsersController < ApiController # There are some other errors that can happen here, besides just EMAIL_NOT_FOUND render :json => { :message => ValidationMessages::EMAIL_NOT_FOUND }, :status => 403 end + set_remember_token(@user) respond_with responder: ApiResponder, :status => 204 end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 23304046b..640145372 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -1,11 +1,11 @@ module SessionsHelper def sign_in(user) - set_remember_token + set_remember_token(user) self.current_user = user end - def set_remember_token + def set_remember_token(user) cookies.permanent[:remember_token] = user.remember_token end