From f0214e00bcb5c95e7b45ded76bd52c5987aab4bf Mon Sep 17 00:00:00 2001
From: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Date: Wed, 19 Aug 2015 13:17:17 -0300
Subject: [PATCH] Changed exception class name and message to a better legibility

---
 app/controllers/public/account_controller.rb | 2 +-
 app/models/user.rb                           | 8 ++++----
 test/functional/account_controller_test.rb   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 7f7fdea..6cb381d 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -48,7 +48,7 @@ class AccountController < ApplicationController
 
     begin
       self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
-    rescue NoosferoExceptions::UserInactive => e
+    rescue NoosferoExceptions::UserNotActivated => e
       session[:notice] = e.message
       return
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index db60060..0b9f998 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -245,8 +245,8 @@ class User < ActiveRecord::Base
   def authenticated?(password)
 
     unless self.activated?
-      message = _('The user "%{login}" is not active!') % {login: self.login}
-      raise NoosferoExceptions::UserInactive.new(message, self)
+      message = _('The user "%{login}" is not activated! Please check your email to activate your user') % {login: self.login}
+      raise NoosferoExceptions::UserNotActivated.new(message, self)
     end
 
     result = (crypted_password == encrypt(password))
@@ -293,7 +293,7 @@ class User < ActiveRecord::Base
         self.errors.add(:current_password, _('does not match.'))
         raise IncorrectPassword
       end
-    rescue NoosferoExceptions::UserInactive => e
+    rescue NoosferoExceptions::UserNotActivated => e
       self.errors.add(:current_password, e.message)
       raise IncorrectPassword
     end
@@ -413,7 +413,7 @@ class User < ActiveRecord::Base
 end
 
 module NoosferoExceptions
-  class UserInactive < ActiveRecord::ActiveRecordError
+  class UserNotActivated < ActiveRecord::ActiveRecordError
     attr_reader :user
 
     def initialize(message, user = nil)
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 4ea376d..e5b5696 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -44,7 +44,7 @@ class AccountControllerTest < ActionController::TestCase
     user = User.create!(login: 'testuser', email: 'test@email.com', password:'test', password_confirmation:'test', activation_code: nil)
     post :login, :user => { :login => 'testuser', :password => 'test' }
 
-    assert_match 'not active', session[:notice]
+    assert_match 'not activated', session[:notice]
     assert_nil session[:user]
   end
 
@@ -759,7 +759,7 @@ class AccountControllerTest < ActionController::TestCase
     assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
 
-    assert_match 'not active', session[:notice]
+    assert_match 'not activated', session[:notice]
     assert_nil session[:user]
   end
 
@@ -770,7 +770,7 @@ class AccountControllerTest < ActionController::TestCase
     assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
 
-    assert_match 'not active', session[:notice]
+    assert_match 'not activated', session[:notice]
     assert_nil session[:user]
   end
 
--
libgit2 0.21.2