toulouse-maelis: [functests] re-enabling tests on loisirs (#77634)

This commit is contained in:
Nicolas Roche 2023-05-15 10:10:15 +02:00
parent c3f73b74f8
commit db0f21ae87
5 changed files with 102 additions and 22 deletions

View File

@ -422,7 +422,7 @@ def referentials(request, conn):
@pytest.fixture(scope='session')
def create_data(request, conn):
def create_data(request, conn, reference_year):
name_id = request.config.getoption('--nameid')
unlink(conn, name_id)
lastname = 'TEST_' + uuid4().hex[0:25]
@ -449,6 +449,21 @@ def create_data(request, conn):
resp.raise_for_status()
create_result = resp.json()
assert create_result['err'] == 0
# add requiered quotient for subscriptions
data = read_family(conn, name_id)
url = conn + '/update-quotient?NameID=%s&rl_id=%s' % (name_id, data['RL1']['num'])
payload = {
'yearRev': str(reference_year),
'dateStart': '2023-05-15',
'dateEnd': '3000-12-31',
'mtt': '5000.0',
'cdquo': '1',
}
resp = requests.post(url, json=payload)
resp.raise_for_status()
assert resp.json()['err'] == 0
print('\ncreate DUI: %s' % str(create_result['data']['number']))
data = diff_family(conn, name_id, 'test_create_family.json')

View File

@ -42,7 +42,17 @@
"profession": null,
"CAFInfo": null,
"indicatorList": [],
"quotientList": [],
"quotientList": [
{
"yearRev": 2022,
"dateStart": "2023-05-15T00:00:00+02:00",
"dateEnd": "3000-12-31T00:00:00+01:00",
"mtt": 5000.0,
"cdquo": "1",
"codeUti": null,
"cdquo_text": "Revenus fiscaux"
}
],
"subscribeActivityList": [],
"civility_text": "MADAME",
"quality_text": "M\u00e8re"

View File

@ -4,24 +4,33 @@
"dateStart": "2022-01-02T00:00:00+01:00",
"dateEnd": "2022-12-31T00:00:00+01:00",
"mtt": 1500.33,
"cdquo": "1",
"cdquo": "2",
"codeUti": null,
"cdquo_text": "Revenus fiscaux"
"cdquo_text": "Revenus Petite enfance"
},
{
"yearRev": 2021,
"dateStart": "2022-01-01T00:00:00+01:00",
"dateEnd": "2022-01-01T00:00:00+01:00",
"mtt": 1500.33,
"cdquo": "1",
"cdquo": "2",
"codeUti": null,
"cdquo_text": "Revenus fiscaux"
"cdquo_text": "Revenus Petite enfance"
},
{
"yearRev": 2021,
"dateStart": "2022-01-02T00:00:00+01:00",
"dateEnd": "2022-12-31T00:00:00+01:00",
"mtt": 1500.33,
"cdquo": "2",
"codeUti": null,
"cdquo_text": "Revenus Petite enfance"
},
{
"yearRev": 2022,
"dateStart": "2023-05-15T00:00:00+02:00",
"dateEnd": "3000-12-31T00:00:00+01:00",
"mtt": 5000.0,
"cdquo": "1",
"codeUti": null,
"cdquo_text": "Revenus fiscaux"

View File

@ -781,21 +781,22 @@ def test_update_quotient(conn, create_data):
'dateStart': '2022-01-01',
'dateEnd': '2022-12-31',
'mtt': '1500.33',
'cdquo': '1',
'cdquo': '2',
}
resp = requests.post(url, json=payload)
resp.raise_for_status()
assert resp.json()['err'] == 0
data = read_family(conn, create_data['name_id'])
assert data['RL1']['quotientList'] == [
assert len(data['RL1']['quotientList']) == 2
assert data['RL1']['quotients']['2'] == [
{
'yearRev': 2021,
'dateStart': '2022-01-01T00:00:00+01:00',
'dateEnd': '2022-12-31T00:00:00+01:00',
'mtt': 1500.33,
'cdquo': '1',
'cdquo': '2',
'codeUti': None,
'cdquo_text': 'Revenus fiscaux',
'cdquo_text': 'Revenus Petite enfance',
}
]
@ -805,7 +806,7 @@ def test_update_quotient(conn, create_data):
resp.raise_for_status()
assert resp.json()['err'] == 0
data = read_family(conn, create_data['name_id'])
assert len(data['RL1']['quotientList']) == 2
assert len(data['RL1']['quotients']['2']) == 2
# add quotient on another income year
payload['yearRev'] = '2020'
@ -813,7 +814,7 @@ def test_update_quotient(conn, create_data):
resp.raise_for_status()
assert resp.json()['err'] == 0
data = diff_rlg(conn, create_data['name_id'], 1, 'test_update_quotient.json', 'quotientList')
assert len(data['RL1']['quotientList']) == 3
assert len(data['RL1']['quotients']['2']) == 3
# test read-family with reference year
url = conn + '/read-family?NameID=%s&income_year=%s' % (create_data['name_id'], '2020')

View File

@ -10,7 +10,6 @@ from .conftest import link, unlink
# * there is a general catalog to display
@pytest.mark.xfail(run=False)
def test_catalog_general_loisirs(conn, update_data):
unlink(conn, update_data['name_id'])
link(conn, update_data)
@ -33,14 +32,58 @@ def test_catalog_general_loisirs(conn, update_data):
'TEST ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES, MERCREDI - 15h30/17h - 8/15Ans, ARGOULETS'
in labels
)
assert 'TEST Promenade forêt enchantée, TEST Promenade forêt enchantée, TERRITOIRE OUEST' in labels
assert (
'TEST Promenade lac de plaisance du T., TEST Promenade lac de plaisance du T., TERRITOIRE OUEST'
in labels
)
assert 'Promenade forêt enchantée, TEST promenade forêt enchantée, TERRITOIRE OUEST' in labels
for item in resp.json()['data']:
if (
item['text']
== 'TEST ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES, MERCREDI - 13h45/17h - 8/15Ans, ARGOULETS'
):
assert item['criterias'] == {
'nature': {
'text': "Nature de l'activité",
'data': {'1': 'Activités Régulières'},
'order': ['1'],
},
'type': {
'text': "Type de l'activité",
'data': {'activites-aquatiques': 'Activités Aquatiques'},
'order': ['activites-aquatiques'],
},
'public': {
'text': 'Public',
'data': {'1': 'Enfant (3-11 ans)', '2': 'Ado (12-17 ans)'},
'order': ['1', '2'],
},
'day': {'text': 'Jours', 'data': {'3': 'Mercredi'}, 'order': ['3']},
'place': {'text': 'Lieu', 'data': {'A10053179757': 'ARGOULETS'}, 'order': ['A10053179757']},
}
if item['text'] == 'Promenade forêt enchantée, TEST promenade forêt enchantée, TERRITOIRE OUEST':
assert item['criterias'] == {
'nature': {
'text': "Nature de l'activité",
'data': {'1': 'Activités Régulières'},
'order': ['1'],
},
'type': {
'text': "Type de l'activité",
'data': {'activite-pedestre': 'Activité Pédestre'},
'order': ['activite-pedestre'],
},
'public': {'text': 'Public', 'data': {'5': 'Sénior (60 ans et plus)'}, 'order': ['5']},
'day': {
'text': 'Jours',
'data': {'1': 'Lundi', '2': 'Mardi', '3': 'Mercredi', '4': 'Jeudi', '5': 'Vendredi'},
'order': ['1', '2', '3', '4', '5'],
},
'place': {
'text': 'Lieu',
'data': {'A10056517597': 'TERRITOIRE OUEST'},
'order': ['A10056517597'],
},
}
@pytest.mark.xfail(run=False)
def test_catalog_personnalise_loisirs(loisirs_subscribe_info):
assert (
loisirs_subscribe_info['info']['activity']['libelle1']
@ -48,9 +91,9 @@ def test_catalog_personnalise_loisirs(loisirs_subscribe_info):
)
assert loisirs_subscribe_info['info']['calendarGeneration']['code'] == 'FORBIDDEN'
assert loisirs_subscribe_info['info']['billingInformation'] == {
'modeFact': 'FORFAIT',
'quantity': 1.0,
'unitPrice': 150.0,
'modeFact': 'PRESENCE',
'quantity': None,
'unitPrice': 88.5,
}
@ -74,6 +117,7 @@ def test_direct_subscribe(conn, create_data, loisirs_subscribe_info, reference_y
assert resp.json()['data'] == {'controlOK': True, 'message': None}
@pytest.mark.xfail(run=False)
def test_subscribe_with_conveyance(conn, create_data, loisirs_subscribe_info, reference_year):
assert loisirs_subscribe_info['info']['controlResult']['controlOK'] is True
@ -111,6 +155,7 @@ def test_subscribe_with_conveyance(conn, create_data, loisirs_subscribe_info, re
assert resp.json()['err'] == 0
@pytest.mark.xfail(run=False)
def test_subscribe_with_recurrent_week(conn, create_data, loisirs_subscribe_info, reference_year):
assert loisirs_subscribe_info['info']['controlResult']['controlOK'] is True
assert [(x['id'], x['day']) for x in loisirs_subscribe_info['info']['recurrent_week']] == [