From fe9165c7137a8c0fe5809c282e39f8f267ec92e1 Mon Sep 17 00:00:00 2001 From: Nick Hehr Date: Thu, 15 Sep 2016 10:14:03 -0400 Subject: [PATCH] fix(wifi.connect): checks for encryption object (#216) --- node/tessel-export.js | 2 +- node/test/unit/tessel.js | 54 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/node/tessel-export.js b/node/tessel-export.js index 891118e..686e165 100644 --- a/node/tessel-export.js +++ b/node/tessel-export.js @@ -1556,7 +1556,7 @@ function getWifiInfo() { } // attempt to parse out the security configuration from the returned network object - if (network.encryption.enabled) { + if (network.encryption && network.encryption.enabled) { if (network.encryption.wep) { network.security = 'wep'; } else if (network.encryption.authentication && network.encryption.wpa) { diff --git a/node/test/unit/tessel.js b/node/test/unit/tessel.js index 61c8095..5ae0537 100644 --- a/node/test/unit/tessel.js +++ b/node/test/unit/tessel.js @@ -2753,6 +2753,60 @@ exports['Tessel.Wifi'] = { }); }, + connectWithoutPasswordNoEncryption: function(test) { + test.expect(4); + + var settings = { + ssid: 'TestNetwork' + }; + var ipResult = `wlan0 Link encap:Ethernet HWaddr 02:A3:AA:A9:FB:02 + inet addr:10.0.1.11 Bcast:192.168.1.101 Mask:255.255.255.0 + inet6 addr: fe80::a3:aaff:fea9:fb02/64 Scope:Link + UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 + RX packets:2786 errors:0 dropped:0 overruns:0 frame:0 + TX packets:493 errors:0 dropped:0 overruns:0 carrier:0 + collisions:0 txqueuelen:1000 + RX bytes:833626 (814.0 KiB) TX bytes:97959 (95.6 KiB)`; + var ip = '192.168.1.101'; + var network = { + ssid: 'TestNetwork', + strength: '30/80' + }; + + this.exec.restore(); + this.exec = sandbox.stub(childProcess, 'exec', (cmd, callback) => { + if (cmd === 'ifconfig wlan0') { + callback(null, ipResult); + } else if (cmd === `ubus call iwinfo info '{"device":"wlan0"}'`) { + callback(null, JSON.stringify(network)); + } else { + callback(); + } + }); + + var results = Object.assign({ + ip: ip, + security: 'none' + }, settings, network); + + this.tessel.network.wifi.on('connect', (networkSettings) => { + test.deepEqual(networkSettings, results, 'correct settings'); + }); + + this.tessel.network.wifi.connect(settings, (error, networkSettings) => { + if (error) { + test.fail(error); + test.done(); + } + + test.deepEqual(networkSettings, results, 'correct settings'); + test.deepEqual(this.tessel.network.wifi.settings, results, 'correct settings property'); + test.equal(this.exec.callCount, 6, 'exec called correctly'); + + test.done(); + }); + }, + connectThrowsError: function(test) { test.expect(2);