Fix: Mock device scanning and test, now with T8.

Removed T5 from mock devices in test mode, and added T8 instead.

Reverted code from previous commit d679c466 in device_keeper::listAllDevices that was trying to branch on options.enableDemoMode.

Author: rolsen

ljswitchboard-io_manager/lib/managers/device_manager_helpers/device_keeper.js

@@ -635,54 +635,10 @@ function createDeviceKeeper(io_delegator, link) {
 		});
 
 		// Start device scan
-		if(options.enableDemoMode) {
-			var mockDevices = [{
-					'deviceType': 'LJM_dtT7',
-					'connectionType': 'LJM_ctETHERNET',
-					'serialNumber': 1,
-				}, {
-					'deviceType': 'LJM_dtT7',
-					'connectionType': 'LJM_ctUSB',
-					'serialNumber': 1,
-				}, {
-					'deviceType': 'LJM_dtT4',
-					'connectionType': 'LJM_ctUSB',
-					'serialNumber': 4,
-				}, // {
-				// 	'deviceType': 'LJM_dtT8',
-				// 	'connectionType': 'LJM_ctUSB',
-				// 	'serialNumber': 8,
-				// }
-			];
-			deviceScanner.addMockDevices(mockDevices)
-			.then(function(res) {
-				deviceScanner.disableDeviceScanning()
-				.then(function(res) {
-					deviceScanner.findAllDevices(currentDevices, options)
-					.then(function(data) {
-						defered.resolve(data);
-					}, defered.reject);
-				}, function(err) {
-					deviceScanner.findAllDevices(currentDevices, options)
-					.then(function(data) {
-						defered.resolve(data);
-					}, defered.reject);
-				});
-			});
-		} else {
-			deviceScanner.enableDeviceScanning()
-			.then(function(res) {
-				deviceScanner.findAllDevices(currentDevices, options)
-				.then(function(data) {
-					defered.resolve(data);
-				}, defered.reject);
-			}, function(err) {
-				deviceScanner.findAllDevices(currentDevices, options)
-				.then(function(data) {
-					defered.resolve(data);
-				}, defered.reject);
-			});
-		}
+		deviceScanner.findAllDevices(currentDevices, options)
+		.then(function(data) {
+			defered.resolve(data);
+		}, defered.reject);
 
 		return defered.promise;
 	};

ljswitchboard-kipling_tester/test/mock_module_tests/mock_device_selector.js

@@ -169,8 +169,8 @@ this.test_device_selector = {
 		var t4s = $('.DEVICE_TYPE_T4 .device');
 		test.strictEqual(t4s.length, 1, 'Unexpected number of T4s found');
 
-		var t5s = $('.DEVICE_TYPE_T5 .device');
-		test.strictEqual(t5s.length, 1, 'Unexpected number of T5s found');
+		var t8s = $('.DEVICE_TYPE_T8 .device');
+		test.strictEqual(t8s.length, 1, 'Unexpected number of T8s found');
 
 		test.done();
 	},

ljswitchboard-kipling_tester/test/mock_module_tests/mock_devices.js

@@ -40,15 +40,23 @@ var mockDevices = [{
 		'POWER_LED': 1,
 	},
 }, {
-	'deviceType': 'LJM_dtT4',
+	'deviceType': 'LJM_dtT8',
 	'connectionType': 'LJM_ctUSB',
-	'serialNumber': 44001000,
+	'serialNumber': 8,
+	'WIFI_RSSI': -65,
 	'deviceConfig': {
+		'TEMPERATURE_DEVICE_K': 210.69,
+		'CURRENT_SOURCE_200UA_CAL_VALUE': 0.000123123,
+		'CURRENT_SOURCE_10UA_CAL_VALUE': 0.000123123,
+		'POWER_ETHERNET': 1,
+		'POWER_WIFI': 1,
+		'POWER_AIN': 1,
+		'POWER_LED': 1,
 	},
 }, {
-	'deviceType': 'LJM_dtT5',
+	'deviceType': 'LJM_dtT4',
 	'connectionType': 'LJM_ctUSB',
-	'serialNumber': 45001000,
+	'serialNumber': 44001000,
 	'deviceConfig': {
 	},
 }, {