mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-01-05 14:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

update shell.openExternal to promisified

Browse Source
This commit is contained in:
Zach Bloomquist
2019-08-02 18:04:09 -04:00
parent 0cbd954601
commit 8b6460d015
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/server/lib/gui/auth.js
View File

@@ -191,8 +191,8 @@ const _launchNativeAuth = (loginUrl, sendMessage) => {
openExternalAttempted = true
// wrap openExternal here in case `electron.shell` is not available (during tests)
return Promise.fromCallback((cb) => {
shell.openExternal(loginUrl, {}, cb)
return Promise.try(() => {
return shell.openExternal(loginUrl)
})
.catch((err) => {
debug('Error launching native auth: %o', { err })

24
packages/server/test/unit/gui/auth_spec.js
View File

@@ -88,21 +88,23 @@ describe('lib/gui/auth', function () {
})
it('returns a promise that is fulfilled when openExternal succeeds', function () {
sinon.stub(electron.shell, 'openExternal').callsArg(2)
return auth._launchNativeAuth(REDIRECT_URL)
.then(() => {
expect(electron.shell.openExternal).to.be.calledWithMatch(REDIRECT_URL, {}, sinon.match.func)
})
})
it('is still fulfilled when openExternal fails, but sendWarning is called', function () {
sinon.stub(electron.shell, 'openExternal').callsArgWith(2, new Error)
sinon.stub(electron.shell, 'openExternal').resolves()
const sendWarning = sinon.stub()
return auth._launchNativeAuth(REDIRECT_URL, sendWarning)
.then(() => {
expect(electron.shell.openExternal).to.be.calledWithMatch(REDIRECT_URL, {}, sinon.match.func)
expect(electron.shell.openExternal).to.be.calledWithMatch(REDIRECT_URL)
expect(sendWarning).to.not.be.called
})
})
it('is still fulfilled when openExternal fails, but sendWarning is called', function () {
sinon.stub(electron.shell, 'openExternal').rejects(new Error)
const sendWarning = sinon.stub()
return auth._launchNativeAuth(REDIRECT_URL, sendWarning)
.then(() => {
expect(electron.shell.openExternal).to.be.calledWithMatch(REDIRECT_URL)
expect(sendWarning).to.be.calledWithMatch('warning', 'AUTH_COULD_NOT_LAUNCH_BROWSER', REDIRECT_URL)
})
})