rails4: fix user tests

Braulio Bhavamitra
1 parent db650139
Showing 2 changed files with 4 additions and 4 deletions Show diff stats
app/models/user.rb
test/unit/user_test.rb
@@ -280,12 +280,12 @@ class User &lt; ActiveRecord::Base
   end
   def name
-    name = (self[:name] || login)
+    name = (@name || login)
     person.nil? ? name : (person.name || name)
   end
   def name= name
-    self[:name] = name
+    @name = name
   end
   def enable_email!
@@ -305,7 +305,7 @@ class UserTest &lt; ActiveSupport::TestCase
   should 'not has email activation pending if not have environment' do
     user = create_user('cooler')
-    user.expects(:environment).returns(nil)
+    user.expects(:environment).returns(nil).at_least_once
     EmailActivation.create!(:requestor => user.person, :target => Environment.default)
     assert !user.email_activation_pending?
   end
@@ -470,9 +470,9 @@ class UserTest &lt; ActiveSupport::TestCase
   should 'respond name with user name attribute' do
     user = create_user('testuser')
+    user.login = 'Login User'
     user.person = nil
     user.name = 'Another User'
-    user.login = 'Login User'
     assert_equal 'Another User', user.name
   end
	@@ -280,12 +280,12 @@ class User < ActiveRecord::Base		@@ -280,12 +280,12 @@ class User < ActiveRecord::Base
280	end	280	end
281		281
282	def name	282	def name
283	- name = (self[:name] \|\| login)	283	+ name = (@name \|\| login)
284	person.nil? ? name : (person.name \|\| name)	284	person.nil? ? name : (person.name \|\| name)
285	end	285	end
286		286
287	def name= name	287	def name= name
288	- self[:name] = name	288	+ @name = name
289	end	289	end
290		290
291	def enable_email!	291	def enable_email!