jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-27 13:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(GUI): display untitled device when device lacks description

Browse Source 
We fallback to `'Untitled Device'` when the device lacks a
`.description` field.

Change-Type: patch
Changelog-Entry: Display Untitled Device when the device lacks a
description field.
This commit is contained in:
Benedict Aas 2018-04-12 21:12:56 +01:00
parent 347932b213
commit d59ebad167
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gui/app/pages/main/controllers/drive-selection.js
View File

@ -39,7 +39,7 @@ module.exports = function (DriveSelectorService) {
// eslint-disable-next-line no-magic-numbers // eslint-disable-next-line no-magic-numbers
if (drives.length === 1) { if (drives.length === 1) {
return _.head(drives).description return _.head(drives).description || 'Untitled Device'
} }
return `${drives.length} Devices` return `${drives.length} Devices`

17
tests/gui/pages/main.spec.js
View File

@ -260,8 +260,8 @@ describe('Browser: MainPage', function () {
let DriveSelectionController let DriveSelectionController
const drivePaths = process.platform === 'win32' const drivePaths = process.platform === 'win32'
? [ 'E:\\', 'F:\\' ] ? [ '\\\\.\\PhysicalDrive1', '\\\\.\\PhysicalDrive2', '\\\\.\\PhysicalDrive3' ]
: [ '/dev/disk1', '/dev/disk2' ] : [ '/dev/disk1', '/dev/disk2', '/dev/disk3' ]
const drives = [ const drives = [
{ {
device: drivePaths[0], device: drivePaths[0],
@ -280,6 +280,14 @@ describe('Browser: MainPage', function () {
mountpoints: [ drivePaths[1] ], mountpoints: [ drivePaths[1] ],
isSystem: false, isSystem: false,
isReadOnly: false isReadOnly: false
},
{
device: drivePaths[2],
size: 987654321,
displayName: drivePaths[2],
mountpoints: [],
isSystem: false,
isReadOnly: false
} }
] ]
@ -302,6 +310,11 @@ describe('Browser: MainPage', function () {
m.chai.expect(DriveSelectionController.getDrivesTitle()).to.equal(drives[0].description) m.chai.expect(DriveSelectionController.getDrivesTitle()).to.equal(drives[0].description)
}) })
it('should return untitled when there is no description', function () {
selectionState.selectDrive(drives[2].device)
m.chai.expect(DriveSelectionController.getDrivesTitle()).to.equal('Untitled Device')
})
it('should return a consolidated title with quantity when there are multiple drives', function () { it('should return a consolidated title with quantity when there are multiple drives', function () {
selectionState.selectDrive(drives[0].device) selectionState.selectDrive(drives[0].device)
selectionState.selectDrive(drives[1].device) selectionState.selectDrive(drives[1].device)