Download as
Browse Code »

Commit c5df21ab7c6155ff2a6850cefec637449229bd79

Authored by Leandro Santos
1 parent 4ad3a6f3
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

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,11 +759,10 @@ class EnvironmentTest < ActiveSupport::TestCase
759 759
760 should 'set custom_person_fields with its dependecies' do 760 should 'set custom_person_fields with its dependecies' do
761 env = Environment.new 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 end 766 end
768 767
769 should 'not set in custom_person_fields if not in person.fields' do 768 should 'not set in custom_person_fields if not in person.fields' do
@@ -771,7 +770,8 @@ class EnvironmentTest < ActiveSupport::TestCase @@ -771,7 +770,8 @@ class EnvironmentTest < ActiveSupport::TestCase
771 Person.stubs(:fields).returns(['cell_phone', 'comercial_phone']) 770 Person.stubs(:fields).returns(['cell_phone', 'comercial_phone'])
772 771
773 env.custom_person_fields = { 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'true'}} 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 assert ! env.custom_person_fields.keys.include?('birth_date') 775 assert ! env.custom_person_fields.keys.include?('birth_date')
776 end 776 end
777 777
@@ -780,8 +780,8 @@ class EnvironmentTest < ActiveSupport::TestCase @@ -780,8 +780,8 @@ class EnvironmentTest < ActiveSupport::TestCase
780 Person.stubs(:fields).returns(['cell_phone', 'schooling']) 780 Person.stubs(:fields).returns(['cell_phone', 'schooling'])
781 781
782 env.custom_person_fields = { 'schooling' => {'required' => 'true', 'active' => 'true'}} 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 assert ! env.custom_person_fields.keys.include?('birth_date') 785 assert ! env.custom_person_fields.keys.include?('birth_date')
786 end 786 end
787 787