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(shared): Fix getDriveImageCompatibilityStatuses() and tests

Browse Source 
Change-type: patch
Signed-off-by: Alexis Svinartchouk <alexis@resin.io>
This commit is contained in:
Alexis Svinartchouk 2018-09-06 18:50:13 +02:00
parent aaccd10c2a
commit 65d86460cb
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/shared/drive-constraints.js
View File

@ -348,7 +348,7 @@ exports.getDriveImageCompatibilityStatuses = (drive, image) => {
message: messages.compatibility.locked() message: messages.compatibility.locked()
}) })
} else if (!_.isNil(drive) && !_.isNil(drive.size) && !exports.isDriveLargeEnough(drive, image)) { } else if (!_.isNil(drive) && !_.isNil(drive.size) && !exports.isDriveLargeEnough(drive, image)) {
const imageSize = _.get(image, [ 'isSizeEstimated' ]) ? image.size : image.compressedSize const imageSize = image.isSizeEstimated ? image.compressedSize : image.size
const relativeBytes = imageSize - drive.size const relativeBytes = imageSize - drive.size
statusList.push({ statusList.push({
type: exports.COMPATIBILITY_STATUS_TYPES.ERROR, type: exports.COMPATIBILITY_STATUS_TYPES.ERROR,

30
tests/shared/drive-constraints.spec.js
View File

@ -333,12 +333,12 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return true if the final size is equal to the drive size', function () { it('should return true if the final size is equal to the drive size', function () {
this.image.size.final.value = this.drive.size this.image.size = this.drive.size
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
it('should return false if the final size is greater than the drive size', function () { it('should return false if the final size is greater than the drive size', function () {
this.image.size.final.value = this.drive.size + 1 this.image.size = this.drive.size + 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false
}) })
}) })
@ -353,7 +353,7 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return true if the final size is less than the drive size', function () { it('should return true if the final size is less than the drive size', function () {
this.image.size.final.value = this.drive.size - 1 this.image.size = this.drive.size - 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
@ -362,7 +362,7 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return false if the final size is greater than the drive size', function () { it('should return false if the final size is greater than the drive size', function () {
this.image.size.final.value = this.drive.size + 1 this.image.size = this.drive.size + 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false
}) })
}) })
@ -377,12 +377,12 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return true if the final size is less than the drive size', function () { it('should return true if the final size is less than the drive size', function () {
this.image.size.final.value = this.drive.size - 1 this.image.size = this.drive.size - 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
it('should return true if the final size is equal to the drive size', function () { it('should return true if the final size is equal to the drive size', function () {
this.image.size.final.value = this.drive.size this.image.size = this.drive.size
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
@ -408,12 +408,12 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return true if the final size is equal to the drive size', function () { it('should return true if the final size is equal to the drive size', function () {
this.image.size.final.value = this.drive.size this.image.size = this.drive.size
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
it('should return true if the final size is greater than the drive size', function () { it('should return true if the final size is greater than the drive size', function () {
this.image.size.final.value = this.drive.size + 1 this.image.size = this.drive.size + 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
}) })
@ -429,7 +429,7 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return true if the final size is less than the drive size', function () { it('should return true if the final size is less than the drive size', function () {
this.image.size.final.value = this.drive.size - 1 this.image.size = this.drive.size - 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
@ -438,7 +438,7 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return true if the final size is greater than the drive size', function () { it('should return true if the final size is greater than the drive size', function () {
this.image.size.final.value = this.drive.size + 1 this.image.size = this.drive.size + 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.true
}) })
}) })
@ -454,12 +454,12 @@ describe('Shared: DriveConstraints', function () {
}) })
it('should return false if the final size is less than the drive size', function () { it('should return false if the final size is less than the drive size', function () {
this.image.size.final.value = this.drive.size - 1 this.image.size = this.drive.size - 1
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false
}) })
it('should return false if the final size is equal to the drive size', function () { it('should return false if the final size is equal to the drive size', function () {
this.image.size.final.value = this.drive.size this.image.size = this.drive.size
m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false m.chai.expect(constraints.isDriveLargeEnough(this.drive, this.image)).to.be.false
}) })
@ -933,7 +933,7 @@ describe('Shared: DriveConstraints', function () {
describe('given the drive is too small', () => { describe('given the drive is too small', () => {
it('should return the too small error', function () { it('should return the too small error', function () {
this.image.size.final.value = this.drive.size + 1 this.image.size = this.drive.size + 1
const result = constraints.getDriveImageCompatibilityStatuses(this.drive, this.image) const result = constraints.getDriveImageCompatibilityStatuses(this.drive, this.image)
const expected = [ const expected = [
@ -949,7 +949,7 @@ describe('Shared: DriveConstraints', function () {
describe('given the drive size is null', () => { describe('given the drive size is null', () => {
it('should not return the too small error', function () { it('should not return the too small error', function () {
this.image.size.final.value = this.drive.size + 1 this.image.size = this.drive.size + 1
this.drive.size = null this.drive.size = null
const result = constraints.getDriveImageCompatibilityStatuses(this.drive, this.image) const result = constraints.getDriveImageCompatibilityStatuses(this.drive, this.image)
@ -1055,7 +1055,7 @@ describe('Shared: DriveConstraints', function () {
describe('given a too small and system drive', () => { describe('given a too small and system drive', () => {
it('should return the too small drive error by precedence', function () { it('should return the too small drive error by precedence', function () {
this.image.size.final.value = this.drive.size + 1 this.image.size = this.drive.size + 1
this.drive.isSystem = true this.drive.isSystem = true
const result = constraints.getDriveImageCompatibilityStatuses(this.drive, this.image) const result = constraints.getDriveImageCompatibilityStatuses(this.drive, this.image)