Projet

Général

Profil

0003-rename-as_json_attachment-to-as_json-to-be-squashed.patch

Benjamin Dauvergne, 22 octobre 2018 12:05

Télécharger (2,27 ko)

Voir les différences:

Subject: [PATCH 3/3] rename as_json_attachment to as_json (to be squashed)

 tests/test_workflows.py | 4 ++--
 wcs/variables.py        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
tests/test_workflows.py
1213 1213
    assert len(emails.emails['foobar']['msg'].get_payload()) == 3
1214 1214

  
1215 1215
    emails.empty()
1216
    sendmail.attachments = ['form.as_json_attachment', 'form.as_json_attachment_with_files']
1216
    sendmail.attachments = ['utils.attachment(form.as_json)', 'utils.attachment(form.as_json_with_files)']
1217 1217
    sendmail.perform(formdata)
1218 1218
    get_response().process_after_jobs()
1219 1219
    assert emails.count() == 1
1220 1220
    assert emails.emails['foobar']['msg'].is_multipart()
1221 1221
    assert emails.emails['foobar']['msg'].get_content_subtype() == 'mixed'
1222 1222
    assert emails.emails['foobar']['msg'].get_payload(0).get_content_type() == 'text/html'
1223
    assert emails.emails['foobar']['msg'].get_payload(1).get_content_type() == 'application/json'
1223
    assert emails.emails['foobar']['msg'].get_payload(1).get_content_type() == 'application/octet-stream'
1224 1224
    payload1 = emails.emails['foobar']['msg'].get_payload(1)
1225 1225
    payload2 = emails.emails['foobar']['msg'].get_payload(2)
1226 1226
    assert json.loads(formdata.export_to_json(include_files=False)) == json.loads(payload1.get_payload(decode=True))
wcs/variables.py
259 259
        }
260 260

  
261 261
    @property
262
    def as_json_attachment(self):
263
        return self.__to_json_attachment()
262
    def as_json(self):
263
        return self.formdata.export_to_json(include_files=False)
264 264

  
265 265
    @property
266
    def as_json_attachment_with_files(self):
267
        return self.__to_json_attachment(include_files=True)
266
    def as_json_with_files(self):
267
        return self.formdata.export_to_json(include_files=True)
268 268

  
269 269
    def __getitem__(self, key):
270 270
        try:
271
-