Download as
Browse Code »

Commit b759d64186d8ccb12910a4332aef9db6446fe2f2

Authored by Antonio Terceiro
1 parent d3ade277
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

AccountControllerTest: fix assumptions on call to User.data_hash

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
test/functional/account_controller_test.rb
  Diff comments   View file @b759d64
@@ -712,7 +712,7 @@ class AccountControllerTest < ActionController::TestCase @@ -712,7 +712,7 @@ class AccountControllerTest < ActionController::TestCase
712 login_as 'ze' 712 login_as 'ze'
713 713
714 xhr :get, :user_data 714 xhr :get, :user_data
715 - assert_equal User.find_by_login('ze').data_hash.merge({ 'foo' => 'bar', 'test' => 5 }), ActiveSupport::JSON.decode(@response.body) 715 + assert_equal User.find_by_login('ze').data_hash(@controller.gravatar_default).merge({ 'foo' => 'bar', 'test' => 5 }), ActiveSupport::JSON.decode(@response.body)
716 end 716 end
717 717
718 should 'activate user when activation code is present and correct' do 718 should 'activate user when activation code is present and correct' do