Commit b605f7cd9290817a210d5904bff0e524fa855a1c

Authored by Aurelio A. Heckert
Committed by Daniela Feitosa
1 parent 45e5f691

Allow User to respond "name", despite not having a related Person

(ActionItem1933)
Showing 2 changed files with 13 additions and 1 deletions   Show diff stats
app/models/user.rb
... ... @@ -195,7 +195,7 @@ class User < ActiveRecord::Base
195 195 end
196 196  
197 197 def name
198   - person.name
  198 + person ? person.name : login
199 199 end
200 200  
201 201 def enable_email!
... ...
test/unit/user_test.rb
... ... @@ -397,6 +397,18 @@ class UserTest < Test::Unit::TestCase
397 397 assert_equal 15, User.expires_chat_status_every
398 398 end
399 399  
  400 + should 'respond name with related person name' do
  401 + user = create_user('testuser')
  402 + user.person.name = 'Test User'
  403 + assert_equal 'Test User', user.name
  404 + end
  405 +
  406 + should 'respond name with login, if there is no person related' do
  407 + user = create_user('testuser')
  408 + user.person = nil
  409 + assert_equal 'testuser', user.name
  410 + end
  411 +
400 412 protected
401 413 def new_user(options = {})
402 414 user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
... ...