Download as
Browse Code »

Commit f0214e00bcb5c95e7b45ded76bd52c5987aab4bf

Authored by Michel Felipe
1 parent 0623ae19
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Changed exception class name and message to a better legibility

Showing 3 changed files with 8 additions and 8 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @f0214e0
@@ -48,7 +48,7 @@ class AccountController < ApplicationController @@ -48,7 +48,7 @@ class AccountController < ApplicationController
48 48
49 begin 49 begin
50 self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user] 50 self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
51 - rescue NoosferoExceptions::UserInactive => e 51 + rescue NoosferoExceptions::UserNotActivated => e
52 session[:notice] = e.message 52 session[:notice] = e.message
53 return 53 return
54 end 54 end
app/models/user.rb
  Diff comments   View file @f0214e0
@@ -245,8 +245,8 @@ class User < ActiveRecord::Base @@ -245,8 +245,8 @@ class User < ActiveRecord::Base
245 def authenticated?(password) 245 def authenticated?(password)
246 246
247 unless self.activated? 247 unless self.activated?
248 - message = _('The user "%{login}" is not active!') % {login: self.login}  
249 - raise NoosferoExceptions::UserInactive.new(message, self) 248 + message = _('The user "%{login}" is not activated! Please check your email to activate your user') % {login: self.login}
  249 + raise NoosferoExceptions::UserNotActivated.new(message, self)
250 end 250 end
251 251
252 result = (crypted_password == encrypt(password)) 252 result = (crypted_password == encrypt(password))
@@ -293,7 +293,7 @@ class User < ActiveRecord::Base @@ -293,7 +293,7 @@ class User < ActiveRecord::Base
293 self.errors.add(:current_password, _('does not match.')) 293 self.errors.add(:current_password, _('does not match.'))
294 raise IncorrectPassword 294 raise IncorrectPassword
295 end 295 end
296 - rescue NoosferoExceptions::UserInactive => e 296 + rescue NoosferoExceptions::UserNotActivated => e
297 self.errors.add(:current_password, e.message) 297 self.errors.add(:current_password, e.message)
298 raise IncorrectPassword 298 raise IncorrectPassword
299 end 299 end
@@ -413,7 +413,7 @@ class User < ActiveRecord::Base @@ -413,7 +413,7 @@ class User < ActiveRecord::Base
413 end 413 end
414 414
415 module NoosferoExceptions 415 module NoosferoExceptions
416 - class UserInactive < ActiveRecord::ActiveRecordError 416 + class UserNotActivated < ActiveRecord::ActiveRecordError
417 attr_reader :user 417 attr_reader :user
418 418
419 def initialize(message, user = nil) 419 def initialize(message, user = nil)
test/functional/account_controller_test.rb
  Diff comments   View file @f0214e0
@@ -44,7 +44,7 @@ class AccountControllerTest &lt; ActionController::TestCase @@ -44,7 +44,7 @@ class AccountControllerTest &lt; ActionController::TestCase
44 user = User.create!(login: 'testuser', email: 'test@email.com', password:'test', password_confirmation:'test', activation_code: nil) 44 user = User.create!(login: 'testuser', email: 'test@email.com', password:'test', password_confirmation:'test', activation_code: nil)
45 post :login, :user => { :login => 'testuser', :password => 'test' } 45 post :login, :user => { :login => 'testuser', :password => 'test' }
46 46
47 - assert_match 'not active', session[:notice] 47 + assert_match 'not activated', session[:notice]
48 assert_nil session[:user] 48 assert_nil session[:user]
49 end 49 end
50 50
@@ -759,7 +759,7 @@ class AccountControllerTest &lt; ActionController::TestCase @@ -759,7 +759,7 @@ class AccountControllerTest &lt; ActionController::TestCase
759 assert_nil assigns(:message) 759 assert_nil assigns(:message)
760 post :login, :user => {:login => 'testuser', :password => 'test123'} 760 post :login, :user => {:login => 'testuser', :password => 'test123'}
761 761
762 - assert_match 'not active', session[:notice] 762 + assert_match 'not activated', session[:notice]
763 assert_nil session[:user] 763 assert_nil session[:user]
764 end 764 end
765 765
@@ -770,7 +770,7 @@ class AccountControllerTest &lt; ActionController::TestCase @@ -770,7 +770,7 @@ class AccountControllerTest &lt; ActionController::TestCase
770 assert_nil assigns(:message) 770 assert_nil assigns(:message)
771 post :login, :user => {:login => 'testuser', :password => 'test123'} 771 post :login, :user => {:login => 'testuser', :password => 'test123'}
772 772
773 - assert_match 'not active', session[:notice] 773 + assert_match 'not activated', session[:notice]
774 assert_nil session[:user] 774 assert_nil session[:user]
775 end 775 end
776 776