From d9d0dc533aad7a17046fcf7fc6cf6bdf67e90b5a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 13 Sep 2022 13:17:05 +0200 Subject: [PATCH] change message when create a new real device --- ereuse_devicehub/inventory/views.py | 11 +++- tests/test_render_2_0.py | 96 +++++++++++++++++++++++------ 2 files changed, 86 insertions(+), 21 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 69cf3968..09c5024a 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -524,7 +524,16 @@ class DeviceCreateView(GenericMixin): messages.error('Sorry, the device could not be created') db.session.commit() - messages.success('Device "{}" created successfully!'.format(form.type.data)) + + amount = form.amount.data + tpy = form.type.data + txt = f'{amount} real Device "{tpy}" created successfully.' + if amount == 1: + phid = form.placeholder.phid + dhid = form.placeholder.device.devicehub_id + txt = f'Device "{tpy}" real with PHID {phid} and DHID {dhid} ' + txt += 'created successfully' + messages.success(txt) return flask.redirect(next_url) return flask.render_template(self.template_name, **self.context) diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index a6cefe58..a0cc2b86 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -445,12 +445,21 @@ def test_add_monitor(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Monitor" created successfully!' in body + dev = Device.query.one() - assert dev.type == 'Monitor' + typ = dev.type + dhid = dev.dhid + phid = dev.phid() + + assert typ == 'Monitor' assert dev.placeholder.id_device_supplier == "b2" assert dev.hid == 'monitor-samsung-lc27t55-aaaab' - assert dev.placeholder.phid == '1' + assert phid == '1' + assert dhid == 'O48N2' + + txt = f'Device "{typ}" real with PHID {phid} and DHID {dhid} ' + txt += 'created successfully' + assert txt in body @pytest.mark.mvp @@ -476,16 +485,25 @@ def test_update_monitor(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Monitor" created successfully!' in body + dev = Device.query.one() - assert dev.type == 'Monitor' + typ = dev.type + dhid = dev.dhid + phid = dev.phid() + + assert typ == 'Monitor' assert dev.placeholder.id_device_supplier == "b2" assert dev.hid == 'monitor-samsung-lc27t55-aaaab' - assert dev.placeholder.phid == '1' + assert phid == '1' + assert dhid == 'O48N2' assert dev.model == 'lc27t55' assert dev.depth == 0.1 assert dev.placeholder.pallet == "l34" + txt = f'Device "{typ}" real with PHID {phid} and DHID {dhid} ' + txt += 'created successfully' + assert txt in body + data = { 'csrf_token': generate_csrf(), 'type': "Monitor", @@ -537,15 +555,24 @@ def test_add_2_monitor(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Monitor" created successfully!' in body + dev = Device.query.one() - assert dev.type == 'Monitor' + typ = dev.type + dhid = dev.dhid + phid = dev.phid() + + assert typ == 'Monitor' assert dev.placeholder.id_device_supplier == "b1" assert dev.hid == 'monitor-samsung-lc27t55-aaaab' - assert dev.placeholder.phid == 'AAB' + assert phid == 'AAB' + assert dhid == 'O48N2' assert dev.model == 'lc27t55' assert dev.placeholder.pallet == "l34" + txt = f'Device "{typ}" real with PHID {phid} and DHID {dhid} ' + txt += 'created successfully' + assert txt in body + data = { 'csrf_token': generate_csrf(), 'type': "Monitor", @@ -561,15 +588,25 @@ def test_add_2_monitor(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Monitor" created successfully!' in body + dev = Device.query.all()[-1] - assert dev.type == 'Monitor' + typ = dev.type + dhid = dev.dhid + phid = dev.phid() + + assert typ == 'Monitor' assert dev.placeholder.id_device_supplier == "b2" assert dev.hid == 'monitor-samsung-lcd_43_b-aaaab' - assert dev.placeholder.phid == '2' + assert phid == '2' assert dev.model == 'lcd 43 b' assert dev.placeholder.pallet == "l20" + assert dhid == 'E39W3' + + txt = f'Device "{typ}" real with PHID {phid} and DHID {dhid} ' + txt += 'created successfully' + assert txt in body + @pytest.mark.mvp @pytest.mark.usefixtures(conftest.app_context.__name__) @@ -593,12 +630,21 @@ def test_add_laptop(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Laptop" created successfully!' in body + dev = Device.query.one() - assert dev.type == 'Laptop' + typ = dev.type + dhid = dev.dhid + phid = dev.phid() + + assert typ == 'Laptop' assert dev.placeholder.id_device_supplier == "b2" assert dev.hid == 'laptop-samsung-lc27t55-aaaab' - assert dev.placeholder.phid == '1' + assert phid == '1' + assert dhid == 'O48N2' + + txt = f'Device "{typ}" real with PHID {phid} and DHID {dhid} ' + txt += 'created successfully' + assert txt in body @pytest.mark.mvp @@ -626,7 +672,8 @@ def test_add_with_ammount_laptops(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Laptop" created successfully!' in body + assert f'{num} real Device "Laptop" created successfully.' in body + for dev in Device.query.all(): assert dev.type == 'Laptop' assert dev.placeholder.id_device_supplier is None @@ -1737,14 +1784,23 @@ def test_edit_laptop(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Laptop" created successfully!' in body + dev = Device.query.one() - assert dev.type == 'Laptop' + typ = dev.type + dhid = dev.dhid + phid = dev.phid() + + assert typ == 'Laptop' + assert dev.placeholder.id_device_supplier == "b2" assert dev.hid == 'laptop-samsung-lc27t55-aaaab' - assert dev.placeholder.phid == '1' - assert dev.placeholder.id_device_supplier == 'b2' assert dev.serial_number == 'aaaab' assert dev.model == 'lc27t55' + assert phid == '1' + assert dhid == 'O48N2' + + txt = f'Device "{typ}" real with PHID {phid} and DHID {dhid} ' + txt += 'created successfully' + assert txt in body uri = '/inventory/device/edit/{}/'.format(dev.devicehub_id) body, status = user3.get(uri)