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

Merge pull request #2510 from resin-io/fix-file-selector-constraint-path

Browse Source 
Fix incorrect file constraint path
This commit is contained in:
Lorenzo Alberto Maria Ambrosi 2018-10-17 16:42:46 +02:00 committed by GitHub
commit 89fa682721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gui/app/components/file-selector/controllers/file-selector.js
View File

@ -16,6 +16,7 @@
'use strict' 'use strict'
const _ = require('lodash')
const os = require('os') const os = require('os')
const settings = require('../../../models/settings') const settings = require('../../../models/settings')
const utils = require('../../../../../shared/utils') const utils = require('../../../../../shared/utils')
@ -65,6 +66,7 @@ module.exports = function (
* <file-selector path="FileSelectorController.getPath()"></file-selector> * <file-selector path="FileSelectorController.getPath()"></file-selector>
*/ */
this.getPath = () => { this.getPath = () => {
return this.getFolderConstraint() ? '/' : os.homedir() const constraintFolderPath = this.getFolderConstraint()
return _.isEmpty(constraintFolderPath) ? os.homedir() : constraintFolderPath
} }
} }

2
tests/spectron/runner.spec.js
View File

@ -36,7 +36,7 @@ describe('Spectron', function () {
before('app:start', function () { before('app:start', function () {
app = new spectron.Application({ app = new spectron.Application({
path: entrypoint, path: entrypoint,
port: 9997, port: 9996,
args: [ '.' ] args: [ '.' ]
}) })