update dialog.showOpenDialog to promisified

grabartley · Aug 2, 2019 · 5f178b0 · 5f178b0
1 parent 8b6460d
commit 5f178b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/packages/server/lib/gui/dialog.coffee b/packages/server/lib/gui/dialog.coffee
@@ -15,10 +15,7 @@ module.exports = {
  properties: ["openDirectory"]
  }
 
- new Promise (resolve, reject) ->
- dialog.showOpenDialog props, (paths = []) ->
- process.nextTick ->
- ## return the first path since there can only ever
- ## be a single directory selection
- resolve(paths[0])
+ dialog.showOpenDialog(props)
+ .then ({ filePaths }) ->
+ return filePaths[0]
 }
diff --git a/packages/server/test/unit/gui/dialog_spec.coffee b/packages/server/test/unit/gui/dialog_spec.coffee
@@ -7,7 +7,9 @@ Windows = require("#{root}../lib/gui/windows")
 describe "gui/dialog", ->
  context ".show", ->
  beforeEach ->
- @showOpenDialog = electron.dialog.showOpenDialog = sinon.stub()
+ @showOpenDialog = electron.dialog.showOpenDialog = sinon.stub().resolves({
+ filePaths: []
+ })
 
  it "calls dialog.showOpenDialog with args", ->
  dialog.show()
@@ -16,13 +18,13 @@ describe "gui/dialog", ->
  })
 
  it "resolves with first path", ->
- @showOpenDialog.yields(["foo", "bar"])
+ @showOpenDialog.resolves({
+ filePaths: ["foo", "bar"]
+ })
 
  dialog.show().then (ret) ->
  expect(ret).to.eq("foo")
 
  it "handles null paths", ->
- @showOpenDialog.yields(null)
-
  dialog.show().then (ret) ->
  expect(ret).to.eq(undefined)