new users should create person with name equals to user name not user login

Leandro Nunes dos Santos
1 parent 3183c63b
Showing 2 changed files with 14 additions and 1 deletions Show diff stats
app/models/user.rb
test/unit/user_test.rb
@@ -31,7 +31,7 @@ class User &lt; ActiveRecord::Base
   after_create do |user|
     user.person ||= Person.new
     user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
-    user.person.name ||= user.login
+    user.person.name ||= user.name
     user.person.visible = false unless user.activated?
     user.person.save!
     if user.environment.enabled?('skip_new_user_email_confirmation')
@@ -617,6 +617,19 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'create person with name equal to user name if a user name is defined' do
+    user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
+    user.name = "Some name"
+    user.save
+    assert_equal 'Some name', user.person.name
+  end
+
+  should 'create person with name equal to user login if no user name is defined' do
+    user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
+    user.save
+    assert_equal 'quire', user.person.name
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
	@@ -31,7 +31,7 @@ class User < ActiveRecord::Base		@@ -31,7 +31,7 @@ class User < ActiveRecord::Base
31	after_create do \|user\|	31	after_create do \|user\|
32	user.person \|\|= Person.new	32	user.person \|\|= Person.new
33	user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)	33	user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
34	- user.person.name \|\|= user.login	34	+ user.person.name \|\|= user.name
35	user.person.visible = false unless user.activated?	35	user.person.visible = false unless user.activated?
36	user.person.save!	36	user.person.save!
37	if user.environment.enabled?('skip_new_user_email_confirmation')	37	if user.environment.enabled?('skip_new_user_email_confirmation')
	@@ -617,6 +617,19 @@ class UserTest < ActiveSupport::TestCase		@@ -617,6 +617,19 @@ class UserTest < ActiveSupport::TestCase
617	end	617	end
618	end	618	end
619		619
		620	+ should 'create person with name equal to user name if a user name is defined' do
		621	+ user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
		622	+ user.name = "Some name"
		623	+ user.save
		624	+ assert_equal 'Some name', user.person.name
		625	+ end
		626	+
		627	+ should 'create person with name equal to user login if no user name is defined' do
		628	+ user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
		629	+ user.save
		630	+ assert_equal 'quire', user.person.name
		631	+ end
		632	+
620	protected	633	protected
621	def new_user(options = {})	634	def new_user(options = {})
622	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))	635	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))