jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-24 19:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix uncaught exception if no file was selected from a dialog

Browse Source 
The following error is thrown if the open file dialog is cancelled

without any selection:



  Unhandled rejection TypeError: Cannot read property '0' of undefined

    at Number.indexedGetter (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/call_get.js:106:15)

    at Number.tryCatcher (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/util.js:16:23)

    at Promise._settlePromiseFromHandler (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:503:31)

    at Promise._settlePromise (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:560:18)

    at Promise._settlePromise0 (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:605:10)

    at Promise._settlePromises (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:684:18)

    at Async._drainQueue (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:126:16)

    at Async._drainQueues (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:136:10)

    at Immediate.Async.drainQueues [as _onImmediate] (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:16:14)

    at processImmediate [as _immediateCallback] (timers.js:383:17)



Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
This commit is contained in:
Juan Cruz Viotti 2016-04-05 12:38:34 -04:00
parent f7b22467ee
commit bdd541e90e
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/dialog.js
View File

@ -54,9 +54,11 @@ exports.selectImage = function() {
] ]
} }
] ]
}, resolve); }, function(files) {
return resolve(files || []);
});
}).get(0).then(function(file) { }).get(0).then(function(file) {
if (zipImage.isZip(file) && !zipImage.isValidZipImage(file)) { if (file && zipImage.isZip(file) && !zipImage.isValidZipImage(file)) {
electron.dialog.showErrorBox( electron.dialog.showErrorBox(
'Invalid zip image', 'Invalid zip image',
`${packageJSON.displayName} can only open Zip archives that contain exactly one image file inside.` `${packageJSON.displayName} can only open Zip archives that contain exactly one image file inside.`

18
tests/src/dialog.spec.js
View File

@ -8,6 +8,24 @@ describe('Dialog:', function() {
describe('.selectImage()', function() { describe('.selectImage()', function() {
describe('given the user does not select anything', function() {
beforeEach(function() {
this.showOpenDialogStub = m.sinon.stub(electron.dialog, 'showOpenDialog');
this.showOpenDialogStub.yields(undefined);
});
afterEach(function() {
this.showOpenDialogStub.restore();
});
it('should eventually be undefined', function() {
const promise = dialog.selectImage();
m.chai.expect(promise).to.eventually.be.undefined;
});
});
describe('given the users performs a selection', function() { describe('given the users performs a selection', function() {
beforeEach(function() { beforeEach(function() {