fixed tests

joyja · May 22, 2020 · e51161f · e51161f
1 parent 1d6117f
commit e51161f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/__tests__/server.js b/src/__tests__/server.js
@@ -625,7 +625,7 @@ test('delete modbus with valid arguments and credentials returns deleted device'
       throw error
     })
   expect(ModbusRTU.prototype.connectTCP).toBeCalledTimes(0)
-  expect(ModbusRTU.prototype.close).toBeCalledTimes(0)
+  expect(ModbusRTU.prototype.close).toBeCalledTimes(1)
   expect(deleteModbus.id).toEqual(modbus.id)
   const { devices } = await client.request(query.devices).catch((error) => {
     error
@@ -648,7 +648,7 @@ test('delete ethernetip with valid arguments and credentials returns deleted dev
       throw error
     })
   expect(Controller.prototype.connect).toBeCalledTimes(0)
-  expect(Controller.prototype.destroy).toBeCalledTimes(0)
+  expect(Controller.prototype.destroy).toBeCalledTimes(1)
   expect(deleteEthernetIP.id).toEqual(ethernetip.id)
   const { devices } = await client.request(query.devices).catch((error) => {
     error

diff --git a/src/device/device.js b/src/device/device.js
@@ -22,16 +22,20 @@ class Device extends Model {
     return super.create(fields)
   }
   static async delete(selector) {
-    for (device of Device.instances) {
-      await instance.config.disconnect()
+    for (const instance of this.instances) {
+      if (instance.config) {
+        await instance.config.disconnect()
+      }
     }
     const deleted = await super.delete(selector)
     await ModbusSource.getAll()
     await Modbus.getAll()
     await EthernetIPSource.getAll()
     await EthernetIP.getAll()
-    for (device of Device.instances) {
-      await instance.config.connect()
+    for (const instance of this.instances) {
+      if (instance.config) {
+        await instance.config.connect()
+      }
     }
     return deleted
   }