Merge remote-tracking branch 'upstream/pull/2400'

[rails.git] / test / controllers / users_controller_test.rb

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 8b438e903283e849d23f7971c62fdecedae10e22..feca92df56dbcbe594bdbc2b756b2df737d3c398 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -2,6 +2,8 @@ require "test_helper"
 
 class UsersControllerTest < ActionController::TestCase
   def setup
 
 class UsersControllerTest < ActionController::TestCase
   def setup

+    super
+

     stub_hostip_requests
   end
 
     stub_hostip_requests
   end
 


@@ -1317,7 +1319,7 @@ class UsersControllerTest < ActionController::TestCase
     assert_equal "", user.description
     assert_nil user.home_lat
     assert_nil user.home_lon
     assert_equal "", user.description
     assert_nil user.home_lat
     assert_nil user.home_lon

-    assert_equal false, user.image.file?
+    assert_equal false, user.avatar.attached?

     assert_equal false, user.email_valid
     assert_nil user.new_email
     assert_nil user.auth_provider
     assert_equal false, user.email_valid
     assert_nil user.new_email
     assert_nil user.auth_provider