Download as
Browse Code »

Commit c5df21ab7c6155ff2a6850cefec637449229bd79

Authored by Leandro Santos
1 parent 4ad3a6f3
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, 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_event_date_issue, 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, tasks_keep_filter_params, user_mention, webfinger_server

refactoring tests to make hash comparison more meaningful

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
test/unit/environment_test.rb
  Diff comments   View file @c5df21a
... ... @@ -759,11 +759,10 @@ class EnvironmentTest < ActiveSupport::TestCase
759 759  
760 760 should 'set custom_person_fields with its dependecies' do
761 761 env = Environment.new
762   - env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'comercial_phone'=> {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
  762 + data = {'cell_phone' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'comercial_phone'=> {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
  763 + env.custom_person_fields = data
763 764  
764   - assert_equal({'required' => 'true', 'active' => 'true', 'signup' => 'true'}, env.custom_person_fields['cell_phone'])
765   - assert_equal({'required' => '', 'active' => 'true', 'signup' => '' }, env.custom_person_fields['comercial_phone'])
766   - assert_equal({'required' => '', 'active' => 'true', 'signup' => 'true'}, env.custom_person_fields['description'])
  765 + assert(env.custom_person_fields.merge(data) == env.custom_person_fields)
767 766 end
768 767  
769 768 should 'not set in custom_person_fields if not in person.fields' do
... ... @@ -771,7 +770,8 @@ class EnvironmentTest < ActiveSupport::TestCase
771 770 Person.stubs(:fields).returns(['cell_phone', 'comercial_phone'])
772 771  
773 772 env.custom_person_fields = { 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'true'}}
774   - assert_equal({'required' => 'true','signup' => 'true', 'active' => 'true'}, env.custom_person_fields['cell_phone'])
  773 + expected_hash = {'cell_phone' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}}
  774 + assert(env.custom_person_fields.merge(expected_hash) == env.custom_person_fields)
775 775 assert ! env.custom_person_fields.keys.include?('birth_date')
776 776 end
777 777  
... ... @@ -780,8 +780,8 @@ class EnvironmentTest < ActiveSupport::TestCase
780 780 Person.stubs(:fields).returns(['cell_phone', 'schooling'])
781 781  
782 782 env.custom_person_fields = { 'schooling' => {'required' => 'true', 'active' => 'true'}}
783   - assert_equal({'required' => 'true', 'signup' => 'true', 'active' => 'true'}, env.custom_person_fields['schooling'])
784   - assert_equal({'required' => 'true', 'signup' => 'true', 'active' => 'true'}, env.custom_person_fields['schooling_status'])
  783 + expected_hash = {'schooling' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'schooling_status' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}
  784 + assert(env.custom_person_fields.merge(expected_hash) == env.custom_person_fields)
785 785 assert ! env.custom_person_fields.keys.include?('birth_date')
786 786 end
787 787  
... ...