Download as
Browse Code »

Commit 92267854531972ef774af5779e2e9f561624dded

Authored by Braulio Bhavamitra
1 parent db650139
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

rails4: fix user tests

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @9226785
... ... @@ -280,12 +280,12 @@ class User < ActiveRecord::Base
280 280 end
281 281  
282 282 def name
283   - name = (self[:name] || login)
  283 + name = (@name || login)
284 284 person.nil? ? name : (person.name || name)
285 285 end
286 286  
287 287 def name= name
288   - self[:name] = name
  288 + @name = name
289 289 end
290 290  
291 291 def enable_email!
... ...
test/unit/user_test.rb
  Diff comments   View file @9226785
... ... @@ -305,7 +305,7 @@ class UserTest < ActiveSupport::TestCase
305 305  
306 306 should 'not has email activation pending if not have environment' do
307 307 user = create_user('cooler')
308   - user.expects(:environment).returns(nil)
  308 + user.expects(:environment).returns(nil).at_least_once
309 309 EmailActivation.create!(:requestor => user.person, :target => Environment.default)
310 310 assert !user.email_activation_pending?
311 311 end
... ... @@ -470,9 +470,9 @@ class UserTest < ActiveSupport::TestCase
470 470  
471 471 should 'respond name with user name attribute' do
472 472 user = create_user('testuser')
  473 + user.login = 'Login User'
473 474 user.person = nil
474 475 user.name = 'Another User'
475   - user.login = 'Login User'
476 476 assert_equal 'Another User', user.name
477 477 end
478 478  
... ...