From b759d64186d8ccb12910a4332aef9db6446fe2f2 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Fri, 12 Sep 2014 10:48:44 -0300 Subject: [PATCH] AccountControllerTest: fix assumptions on call to User.data_hash --- test/functional/account_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index b73710e..85a75a4 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -712,7 +712,7 @@ class AccountControllerTest < ActionController::TestCase login_as 'ze' xhr :get, :user_data - assert_equal User.find_by_login('ze').data_hash.merge({ 'foo' => 'bar', 'test' => 5 }), ActiveSupport::JSON.decode(@response.body) + assert_equal User.find_by_login('ze').data_hash(@controller.gravatar_default).merge({ 'foo' => 'bar', 'test' => 5 }), ActiveSupport::JSON.decode(@response.body) end should 'activate user when activation code is present and correct' do -- libgit2 0.21.2