ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-03-11 06:53:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix and improve connection param parsing function

Browse Source
This commit is contained in:
Juan Cruz Viotti 2014-12-01 11:41:32 -04:00
parent a4db6ce572
commit 141fa9be6d
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/connection/connection.coffee
View File

@ -3,7 +3,7 @@ isOnline = require('is-online')
CONNECTION_PARAMETERS = [ CONNECTION_PARAMETERS = [
'network' 'network'
'wifiEssid' 'wifiSsid'
'wifiKey' 'wifiKey'
] ]
@ -12,15 +12,17 @@ CONNECTION_PARAMETERS = [
exports.isOnline = isOnline exports.isOnline = isOnline
validateEthernetConnectionParameters = (parameters = {}) -> validateEthernetConnectionParameters = (parameters = {}) ->
return if not parameters.wifiEssid? and not parameters.wifiKey? return if not parameters.wifiSsid? and not parameters.wifiKey?
return new Error('You can only use wifi options if network is wifi') return new Error('You can only use wifi options if network is wifi')
validateWifiConnectionParameters = (parameters = {}) -> validateWifiConnectionParameters = (parameters = {}) ->
return if parameters.wifiEssid? and parameters.wifiKey? return if parameters.wifiSsid? and parameters.wifiKey?
return new Error('You have to provide an essid and key if network is wifi') return new Error('You have to provide an ssid and key if network is wifi')
exports.parseConnectionParameters = (parameters = {}, callback) -> exports.parseConnectionParameters = (parameters = {}, callback) ->
parameters = _.pick(parameters, CONNECTION_PARAMETERS) parameters = _.pick(parameters, CONNECTION_PARAMETERS)
parameters = _.omit parameters, (value) ->
return not value?
if parameters.network is 'ethernet' if parameters.network is 'ethernet'
error = validateEthernetConnectionParameters(parameters) error = validateEthernetConnectionParameters(parameters)

17
lib/connection/connection.spec.coffee
View File

@ -12,17 +12,21 @@ CONNECTION_PARAMETERS =
hello: 'world' hello: 'world'
validWifi: validWifi:
network: 'wifi' network: 'wifi'
wifiEssid: 'myEssid' wifiSsid: 'mySsid'
wifiKey: 'mySecret' wifiKey: 'mySecret'
ethernetAndWifiOptions: ethernetAndWifiOptions:
network: 'ethernet' network: 'ethernet'
wifiEssid: 'myEssid' wifiSsid: 'mySsid'
wifiKey: 'mySecret' wifiKey: 'mySecret'
ethernetAndUndefinedWifi:
network: 'ethernet'
wifiSsid: undefined
wifiKey: undefined
wifiWithoutOptions: wifiWithoutOptions:
network: 'wifi' network: 'wifi'
unknownWithOptions: unknownWithOptions:
network: 'foobar' network: 'foobar'
wifiEssid: 'myEssid' wifiSsid: 'mySsid'
wifiKey: 'mySecret' wifiKey: 'mySecret'
unknownWithoutOptions: unknownWithoutOptions:
network: 'foobar' network: 'foobar'
@ -109,6 +113,13 @@ describe 'Connection:', ->
params = CONNECTION_PARAMETERS.ethernetAndWifiOptions params = CONNECTION_PARAMETERS.ethernetAndWifiOptions
checkParamsFailure(params, done) checkParamsFailure(params, done)
it 'should discard undefined wifi related options', (done) ->
params = CONNECTION_PARAMETERS.ethernetAndUndefinedWifi
connection.parseConnectionParameters params, (error, result) ->
expect(error).to.not.exist
expect(result).to.deep.equal(network: 'ethernet')
done()
describe 'if network is wifi', -> describe 'if network is wifi', ->
it 'should succeed if has options', (done) -> it 'should succeed if has options', (done) ->