entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

solis: remove nomNaissance from rsa links (#33413)

This commit is contained in:
Thomas NOËL 2019-05-28 14:52:39 +02:00
parent 4905c677b1
commit c07bfee8fb
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passerelle/apps/solis/templates/solis/rsa_user_text.txt
View File

@ -1 +1 @@
{{ etatCivil.genre }} {{ etatCivil.prenom }} {{ etatCivil.nom }}{% if etatCivil.nomNaissance and etatCivil.nomNaissance != etatCivil.nom %} ({{ etatCivil.nomNaissance }}){% endif %}
{{ etatCivil.genre }} {{ etatCivil.prenom }} {{ etatCivil.nom }}

11
tests/test_solis.py
View File

@ -726,7 +726,7 @@ def test_solis_rsa_link_infos_unlink(app, solis):
assert SolisRSALink.objects.first().name_id == NAMEID
assert SolisRSALink.objects.first().user_id == '4273'
assert SolisRSALink.objects.first().code == 'foo'
assert SolisRSALink.objects.first().text == 'MME Prenom NOM (NEENOM)'
assert SolisRSALink.objects.first().text == 'MME Prenom NOM'
# change code
resp = app.post_json(endpoint,
@ -742,7 +742,7 @@ def test_solis_rsa_link_infos_unlink(app, solis):
assert SolisRSALink.objects.first().name_id == NAMEID
assert SolisRSALink.objects.first().user_id == '4273'
assert SolisRSALink.objects.first().code == 'bar'
assert SolisRSALink.objects.first().text == 'MME Prenom NOM (NEENOM)'
assert SolisRSALink.objects.first().text == 'MME Prenom NOM'
# second link
resp = app.post_json(endpoint,
@ -758,7 +758,7 @@ def test_solis_rsa_link_infos_unlink(app, solis):
# verify recorded names after link
assert [x['text'] for x in SolisRSALink.objects.values('text')] == \
['MME Prenom NOM (NEENOM)', 'MME Prenom NOM (NEENOM)']
['MME Prenom NOM', 'MME Prenom NOM']
endpoint = utils.generic_endpoint_url('solis', 'rsa-links', slug=solis.slug)
resp = app.get(endpoint, status=400) # missing name_id
@ -767,8 +767,7 @@ def test_solis_rsa_link_infos_unlink(app, solis):
resp = app.get(endpoint, status=200)
assert resp.json['err'] == 0
assert len(resp.json['data']) == 2
assert resp.json['data'][0]['text'] == resp.json['data'][1]['text'] == \
'MME Prenom NOM (NEENOM)'
assert resp.json['data'][0]['text'] == resp.json['data'][1]['text'] == 'MME Prenom NOM'
# get base informations from a linked user
changed_name = CIVI_INDIVIDU.replace('Prenom', 'Postnom')
@ -783,7 +782,7 @@ def test_solis_rsa_link_infos_unlink(app, solis):
assert resp.json['data']['etatCivil']['prenom'] == 'Postnom'
# user "text" updated in link:
assert SolisRSALink.objects.get(name_id=NAMEID, user_id='4242').text == \
'MME Postnom NOM (NEENOM)'
'MME Postnom NOM'
# get referential for a linked user
with mock.patch('passerelle.utils.Request.get') as requests_get: