[Git][noosfero/noosfero][master] refactoring tests to make hash comparison more meaningful

[Leandro Nunes]

Leandro Nunes pushed to branch master at Noosfero / noosfero


Commits:
c5df21ab by Leandro Nunes dos Santos at 2015-07-12T10:16:45Z
refactoring tests to make hash comparison more meaningful

- - - - -


1 changed file:

- test/unit/environment_test.rb


Changes:

=====================================
test/unit/environment_test.rb
=====================================
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -759,11 +759,10 @@ class EnvironmentTest < ActiveSupport::TestCase
 
   should 'set custom_person_fields with its dependecies' do
     env = Environment.new
-    env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
+    data = {'cell_phone' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
+    env.custom_person_fields = data
 
-    assert_equal({'required' => 'true', 'active' => 'true', 'signup' => 'true'}, env.custom_person_fields['cell_phone'])
-    assert_equal({'required' => '', 'active' => 'true', 'signup' => '' }, env.custom_person_fields['comercial_phone'])
-    assert_equal({'required' => '', 'active' => 'true', 'signup' => 'true'}, env.custom_person_fields['description'])
+    assert(env.custom_person_fields.merge(data) == env.custom_person_fields)
   end
 
   should 'not set in custom_person_fields if not in person.fields' do
@@ -771,7 +770,8 @@ class EnvironmentTest < ActiveSupport::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'comercial_phone'])
 
     env.custom_person_fields = { 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'required' => 'true','signup' => 'true',  'active' => 'true'}, env.custom_person_fields['cell_phone'])
+    expected_hash = {'cell_phone' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}}
+    assert(env.custom_person_fields.merge(expected_hash) == env.custom_person_fields)
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
 
@@ -780,8 +780,8 @@ class EnvironmentTest < ActiveSupport::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'schooling'])
 
     env.custom_person_fields = { 'schooling' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'required' => 'true', 'signup' => 'true', 'active' => 'true'}, env.custom_person_fields['schooling'])
-    assert_equal({'required' => 'true', 'signup' => 'true', 'active' => 'true'}, env.custom_person_fields['schooling_status'])
+    expected_hash = {'schooling' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'schooling_status' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}
+    assert(env.custom_person_fields.merge(expected_hash) == env.custom_person_fields)
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/c5df21ab7c6155ff2a6850cefec637449229bd79
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150712/825edcad/attachment.html>