0001-tests-merge-intervention_id-occurences-57875.patch

Nicolas Roche, 02 novembre 2021 13:15

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

Subject: [PATCH 1/5] tests: merge intervention_id occurences (#57875)

 .../data/toulouse_smart/get_intervention.json | 54 -------------------
 tests/test_toulouse_smart.py                  | 18 ++++---
 2 files changed, 10 insertions(+), 62 deletions(-)
 delete mode 100644 tests/data/toulouse_smart/get_intervention.json

+    {
       "id": "3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b",
       "name": "DI-20210731-0103",
       "description": "Justice nul part",
       "geom": {
         "type": "Point",
         "coordinates": [
 .1431744096480547,
 .69856386916798
         ],
         "crs": "EPSG:3943"
       },
       "interventionData": {},
       "safeguardRequired": false,
       "media": null,
       "safeguardDone": null,
       "interventionCreated": "2021-07-30T22:44:38.748Z",
       "interventionDesired": "2021-07-31T00:40:03Z",
       "interventionDone": null,
       "submitter": {
         "id": null,
         "lastName": "",
         "firstName": "admin",
         "mail": "admin@localhost",
         "furtherInformation": null,
         "phoneNumber": "0699999999",
         "address": ""
       },
       "submitterType": "usager",
       "organizations": [
+        {
           "id": "f1378d8a-12bf-4c14-913f-22624b0ecab8",
           "name": "Direction des P\u00f4les"
         },
+        {
           "id": "8ad4af63-70b5-416f-a75d-c510d83ce1bd",
           "name": "Transport Logistique"
+        }
       ],
       "domain": null,
       "state": {
         "id": "e844e67f-5382-4c0f-94d8-56f618263485",
         "table": null,
         "stateLabel": "Nouveau",
         "closes": false
       },
       "interventionTypeId": "407ef8d6-9b8c-4187-be51-d89f24424768",
       "onPrivateLand": false,
       "duplicates": null,
       "external_number": "36-10",
       "external_status": "statut 1",
       "cityId": "12345",
       "address": "https://wcs.dev.publik.love/backoffice/management/smart/10/"
+    }

           </validation>
         </field>
       </fields>
     </block>
     '''
+                )
     INTERVENTION_ID = json.loads(get_json_file('create_intervention'))['id']
     @mock_response(
         ['/v1/intervention', None, get_json_file('get_intervention')],
         ['/v1/intervention', None, get_json_file('create_intervention')],
+    )
     def test_get_intervention(app, smart):
         resp = app.get(URL + 'get-intervention?id=3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b')
         resp = app.get(URL + 'get-intervention?id=%s' % INTERVENTION_ID)
         assert not resp.json['err']
         assert resp.json['data']['id'] == '3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b'
         assert resp.json['data']['id'] == INTERVENTION_ID
         assert resp.json['data']['state'] == {
             'id': 'e844e67f-5382-4c0f-94d8-56f618263485',
             'table': None,
             'stateLabel': 'Nouveau',
             'closes': False,
+        }
     @mock_response(
         ['/v1/intervention', None, None, 500],
+    )
     def test_get_intervention_error_status(app, smart):
         resp = app.get(URL + 'get-intervention?id=3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b')
         resp = app.get(URL + 'get-intervention?id=%s' % INTERVENTION_ID)
         assert resp.json['err']
         assert 'failed to get' in resp.json['err_desc']
     @mock_response(
         ['/v1/intervention', None, None, 404],
+    )
     def test_get_intervention_wrond_id(app, smart):
         resp = app.get(URL + 'get-intervention?id=3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b')
         resp = app.get(URL + 'get-intervention?id=%s' % INTERVENTION_ID)
         assert resp.json['err']
         assert 'failed to get' in resp.json['err_desc']
         assert '404' in resp.json['err_desc']
     CREATE_INTERVENTION_PAYLOAD_EXTRA = {
         'slug': 'coin',
         'description': 'coin coin',
-...
+        [
             '/api/forms/foo/2/hooks/update_intervention/',
             UPDATE_INTERVENTION_QUERY_ON_ASYNC_CREATION,
             WCS_RESPONSE_SUCCESS,
         ],
+    )
     @mock.patch("django.db.models.fields.UUIDField.get_default", return_value=UUID)
     def test_create_intervention_async(mocked_uuid4, app, smart, wcs_service):
         smart_id = json.loads(get_json_file('create_intervention'))['id']
         mocked_wcs_request_push = mock.patch(
             "passerelle.contrib.toulouse_smart.models.WcsRequest.push",
             return_value=False,
+        )
         mocked_smart_request_push = mock.patch(
             "passerelle.contrib.toulouse_smart.models.SmartRequest.push",
             return_value=False,
+        )
-...
         # smart is up
         mocked_wcs_request_push.stop()
         smart.jobs()
         assert Job.objects.count() == 2
         job = Job.objects.get(method_name='create_intervention_job')
         assert job.status == 'completed'
         wcs_request = smart.wcs_requests.get(uuid=UUID)
         assert wcs_request.result['id'] == smart_id
         assert wcs_request.result['id'] == INTERVENTION_ID
         assert wcs_request.status == 'sent'
         job = Job.objects.get(method_name='update_intervention_job')
         assert job.status == 'registered'
         # wcs is up
         mocked_smart_request_push.stop()
         smart.jobs()
         job = Job.objects.get(method_name='update_intervention_job')
         assert job.status == 'completed'
         smart_request = wcs_request.smart_requests.get()
         assert smart_request.payload['creation_response']['uuid'] == str(UUID)
         assert smart_request.payload['creation_response']['result']['id'] == smart_id
         assert smart_request.payload['creation_response']['result']['id'] == INTERVENTION_ID
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-tests-merge-intervention_id-occurences-57875.patch