0001-profile-remove-redundant-mobile-phone-field-69228.patch

Paul Marillonnet, 19 septembre 2022 16:18

Voir les différences: en ligne côte à côte

Subject: [PATCH] profile: remove redundant mobile phone field (#69228)

 hobo/profile/migrations/0002_add_data.py |  1 -
 tests/test_environment.py                | 18 +++++++-------
 tests/test_settings_loaders.py           | 15 +++++-------
 tests_authentic/test_hobo_deploy.py      | 31 ++++++++----------------
 tests_schemas/example_env.json           | 13 ----------
 5 files changed, 25 insertions(+), 53 deletions(-)

hobo/profile/migrations/0002_add_data.py
18	18	{'label': u'Pays', 'name': 'country', 'disabled': True},
19	19	{'label': u'Date de naissance', 'name': 'birthdate', 'kind': 'birthdate', 'disabled': True},
20	20	{'label': u'Téléphone', 'name': 'phone', 'kind': 'phone_number'},
21		{'label': u'Mobile', 'name': 'mobile', 'kind': 'phone_number'},
22	21	]
23	22
24	23	for i, attribute_dict in enumerate(attributes):

         Variable.objects.create(name='foo3', value='bar3').save()
         AttributeDefinition.objects.create(name='prefered_color', label='not empty').save()
         assert Variable.objects.count() == 3
         assert AttributeDefinition.objects.count() == 12
         assert AttributeDefinition.objects.count() == 11
         assert Variable.objects.get(name='foo').label == ''
         assert AttributeDefinition.objects.get(name='title').description == ''
         assert AttributeDefinition.objects.get(name='title').order == 1
         assert AttributeDefinition.objects.get(name='last_name').order == 3
         assert AttributeDefinition.objects.get(name='prefered_color').order == 12
         assert AttributeDefinition.objects.get(name='prefered_color').order == 11
         # import valid content
         resp = app.get('/', status=200)
-...
         resp.form['parameters_json'] = Upload('export.json', export_json.encode('utf-8'), 'application/json')
         resp = resp.form.submit()
         assert Variable.objects.count() == 3
         assert AttributeDefinition.objects.count() == 12
         assert AttributeDefinition.objects.count() == 11
         assert Variable.objects.get(name='foo').label == 'bar'
         assert AttributeDefinition.objects.get(name='title').description == 'genre'
         assert AttributeDefinition.objects.get(name='title').order == 1
         assert AttributeDefinition.objects.get(name='last_name').label == 'Nom de naissance'
         assert AttributeDefinition.objects.get(name='last_name').order == 3
         assert AttributeDefinition.objects.get(name='prefered_color').order == 12
         assert AttributeDefinition.objects.get(name='prefered_color').order == 11
         # import empty json
         resp = app.get('/', status=200)
-...
         resp.form['parameters_json'] = Upload('export.json', b'{}', 'application/json')
         resp = resp.form.submit()
         assert Variable.objects.count() == 3
         assert AttributeDefinition.objects.count() == 12
         assert AttributeDefinition.objects.count() == 11
         assert Variable.objects.get(name='foo').label == 'bar'
         assert AttributeDefinition.objects.get(name='title').description == 'genre'
         assert AttributeDefinition.objects.get(name='title').order == 1
         assert AttributeDefinition.objects.get(name='last_name').label == 'Nom de naissance'
         assert AttributeDefinition.objects.get(name='last_name').order == 3
         assert AttributeDefinition.objects.get(name='prefered_color').order == 12
         assert AttributeDefinition.objects.get(name='prefered_color').order == 11
         # import from scratch
         Variable.objects.all().delete()
-...
         resp.form['parameters_json'] = Upload('export.json', export_json.encode('utf-8'), 'application/json')
         resp = resp.form.submit()
         assert Variable.objects.count() == 2
         assert AttributeDefinition.objects.count() == 12
         assert AttributeDefinition.objects.count() == 11
         assert Variable.objects.get(name='foo').label == 'bar'
         assert AttributeDefinition.objects.get(name='title').order == 4
         assert AttributeDefinition.objects.get(name='last_name').order == 2
-...
         resp.form['parameters_json'] = Upload('export.json', b'garbage', 'application/json')
         resp = resp.form.submit()
         assert Variable.objects.count() == 2
         assert AttributeDefinition.objects.count() == 12
         assert AttributeDefinition.objects.count() == 11
         # import corrupted json
         export['variables'][0]['label'] = 'foofoo'
-...
         with pytest.raises(IntegrityError):
             resp = resp.form.submit()
         assert Variable.objects.count() == 2
         assert AttributeDefinition.objects.count() == 12
         assert AttributeDefinition.objects.count() == 11
         assert Variable.objects.get(name='foo').label == 'bar'

             u'country',
             u'birthdate',
             u'phone',
             u'mobile',
+        ]
         # swap title and mobile fields
         # swap title and phone fields
         title = AttributeDefinition.objects.get(name='title')
         mobile = AttributeDefinition.objects.get(name='mobile')
         (title.order, mobile.order) = (mobile.order, title.order)
         phone = AttributeDefinition.objects.get(name='phone')
         (title.order, phone.order) = (phone.order, title.order)
         title.save()
         mobile.save()
         phone.save()
         env = get_hobo_json()
         fields = env['profile']['fields']
         assert [x['name'] for x in fields] == [
             u'mobile',
             u'phone',
             u'first_name',
             u'last_name',
             u'email',
-...
             u'city',
             u'country',
             u'birthdate',
             u'phone',
             u'title',
+        ]
         assert [x['name'] for x in fields if x['disabled']] == ['country', 'birthdate', 'title']
         profile_fields = [x['name'] for x in fields if not x['disabled']]
         assert profile_fields == [
             u'mobile',
             u'phone',
             u'first_name',
             u'last_name',
             u'email',
             u'address',
             u'zipcode',
             u'city',
             u'phone',
+        ]
         # serialize hobo.json

                         'asked_on_registration': False,
                         'name': 'fr_phone',
                     },
+                    {
                         'kind': 'string',
                         'description': '',
                         'required': False,
                         'user_visible': True,
                         'label': 'Mobile',
                         'disabled': False,
                         'user_editable': True,
                         'asked_on_registration': False,
                         'name': 'mobile',
                     },
+                    {
                         'kind': 'string',
                         'description': '',
-...
             assert user.is_staff is True
             from authentic2.models import Attribute
             assert Attribute.all_objects.count() == 12
             assert Attribute.all_objects.count() == 11
             for field in env['profile']['fields']:
                 if field['name'] != 'email':
                     at = Attribute.all_objects.get(name=field['name'])
-...
             assert policy.authn_request_signed is False
             assert policy.accepted_name_id_format == ['uuid']
             assert policy.default_name_id_format == 'uuid'
             assert policy.attributes.count() == 16
             assert policy.attributes.filter(enabled=True).count() == 13
             assert policy.attributes.count() == 15
             assert policy.attributes.filter(enabled=True).count() == 12
             assert policy.attributes.filter(enabled=False).count() == 3
             assert policy.attributes.filter(name_format='basic').count() == 16
             assert policy.attributes.filter(name_format='basic').count() == 15
             assert (
                 policy.attributes.filter(name='is_superuser', attribute_name='django_user_is_superuser').count()
                 == 1
-...
         # test attribute kind update
         with tenant_context(tenant):
             assert Attribute.objects.filter(name='mobile', kind='string').count() == 1
         field = env['profile']['fields'][9]
         assert field['name'] == 'mobile'
         field['kind'] = 'phone_number'
             assert Attribute.objects.filter(name='phone', kind='phone_number').count() == 1
         field = env['profile']['fields'][7]
         assert field['name'] == 'phone'
         field['kind'] = 'string'
         side_effect_iter = iter([meta1, meta2, RequestException(), meta4, meta3])
         with mock.patch('hobo.agent.authentic2.provisionning.notify_agents') as mock_notify, mock.patch(
             'hobo.agent.authentic2.management.commands.hobo_deploy.sleep', wraps=time.sleep
         ) as sleep_mock:
             call_command('hobo_deploy', 'http://sso.example.net', hobo_json(), ignore_timestamp=True)
         with tenant_context(tenant):
             assert Attribute.objects.filter(name='mobile', kind='string').count() == 0
             assert Attribute.objects.filter(name='mobile', kind='phone_number').count() == 1
             assert Attribute.objects.filter(name='phone', kind='phone_number').count() == 0
             assert Attribute.objects.filter(name='phone', kind='string').count() == 1
     def test_import_template(db, tenant_base):

                     "searchable": false,
                     "user_editable": true,
                     "user_visible": true
                 },
+                {
                     "asked_on_registration": false,
                     "description": "",
                     "disabled": false,
                     "kind": "phone_number",
                     "label": "Mobile",
                     "name": "mobile",
                     "required": false,
                     "required_on_login": false,
                     "searchable": false,
                     "user_editable": true,
                     "user_visible": true
+                }
+            ]
         },
+    -

Projet

Général

Profil

Produits Entr'ouvert » Hobo

0001-profile-remove-redundant-mobile-phone-field-69228.patch