Projet

Général

Profil

0001-solis-remove-nomNaissance-from-rsa-links-33413.patch

Thomas Noël, 28 mai 2019 14:53

Télécharger (3,43 ko)

Voir les différences: 

Subject: [PATCH] solis: remove nomNaissance from rsa links (#33413)


 .../apps/solis/templates/solis/rsa_user_text.txt      |  2 +-
 tests/test_solis.py                                   | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)
passerelle/apps/solis/templates/solis/rsa_user_text.txt
1 
{{ etatCivil.genre }} {{ etatCivil.prenom }} {{ etatCivil.nom }}{% if etatCivil.nomNaissance and etatCivil.nomNaissance != etatCivil.nom %} ({{ etatCivil.nomNaissance }}){% endif %}
1 
{{ etatCivil.genre }} {{ etatCivil.prenom }} {{ etatCivil.nom }}
tests/test_solis.py
726 726 
            assert SolisRSALink.objects.first().name_id == NAMEID
727 727 
            assert SolisRSALink.objects.first().user_id == '4273'
728 728 
            assert SolisRSALink.objects.first().code == 'foo'
729 
            assert SolisRSALink.objects.first().text == 'MME Prenom NOM (NEENOM)'
729 
            assert SolisRSALink.objects.first().text == 'MME Prenom NOM'
730 730 

  		




  731
  731
  
    
            # change code

  		




  732
  732
  
    
            resp = app.post_json(endpoint,

  		




  ......




  742
  742
  
    
            assert SolisRSALink.objects.first().name_id == NAMEID

  		




  743
  743
  
    
            assert SolisRSALink.objects.first().user_id == '4273'

  		




  744
  744
  
    
            assert SolisRSALink.objects.first().code == 'bar'

  		




  745
  
  
    
            assert SolisRSALink.objects.first().text == 'MME Prenom NOM (NEENOM)'

  		




  
  745
  
    
            assert SolisRSALink.objects.first().text == 'MME Prenom NOM'

  		




  746
  746
  
    

  		




  747
  747
  
    
            # second link

  		




  748
  748
  
    
            resp = app.post_json(endpoint,

  		




  ......




  758
  758
  
    

  		




  759
  759
  
    
    # verify recorded names after link

  		




  760
  760
  
    
    assert [x['text'] for x in SolisRSALink.objects.values('text')] == \

  		




  761
  
  
    
        ['MME Prenom NOM (NEENOM)', 'MME Prenom NOM (NEENOM)']

  		




  
  761
  
    
        ['MME Prenom NOM', 'MME Prenom NOM']

  		




  762
  762
  
    

  		




  763
  763
  
    
    endpoint = utils.generic_endpoint_url('solis', 'rsa-links', slug=solis.slug)

  		




  764
  764
  
    
    resp = app.get(endpoint, status=400)  # missing name_id

  		




  ......




  767
  767
  
    
    resp = app.get(endpoint, status=200)

  		




  768
  768
  
    
    assert resp.json['err'] == 0

  		




  769
  769
  
    
    assert len(resp.json['data']) == 2

  		




  770
  
  
    
    assert resp.json['data'][0]['text'] == resp.json['data'][1]['text'] == \

  		




  771
  
  
    
        'MME Prenom NOM (NEENOM)'

  		




  
  770
  
    
    assert resp.json['data'][0]['text'] == resp.json['data'][1]['text'] == 'MME Prenom NOM'

  		




  772
  771
  
    

  		




  773
  772
  
    
    # get base informations from a linked user

  		




  774
  773
  
    
    changed_name = CIVI_INDIVIDU.replace('Prenom', 'Postnom')

  		




  ......




  783
  782
  
    
            assert resp.json['data']['etatCivil']['prenom'] == 'Postnom'

  		




  784
  783
  
    
            # user "text" updated in link:

  		




  785
  784
  
    
            assert SolisRSALink.objects.get(name_id=NAMEID, user_id='4242').text == \

  		




  786
  
  
    
                'MME Postnom NOM (NEENOM)'

  		




  
  785
  
    
                'MME Postnom NOM'

  		




  787
  786
  
    

  		




  788
  787
  
    
    # get referential for a linked user

  		




  789
  788
  
    
    with mock.patch('passerelle.utils.Request.get') as requests_get:

  		




  790
  
  
    
-