From b4cce8e24060f3d68ed5822a20fb7327421e1b83 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Mon, 18 Jun 2018 09:50:37 -0700 Subject: [PATCH] spec: convert IAP and GC specs to expect (#13272) * spec: convert IAP and GC specs to expect * address review --- spec/api-global-shortcut-spec.js | 18 +++++++++------- spec/api-in-app-purchase-spec.js | 35 +++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/spec/api-global-shortcut-spec.js b/spec/api-global-shortcut-spec.js index 1c2fa1643570..718a1ca86980 100644 --- a/spec/api-global-shortcut-spec.js +++ b/spec/api-global-shortcut-spec.js @@ -1,8 +1,12 @@ const {globalShortcut} = require('electron').remote -const assert = require('assert') +const chai = require('chai') +const dirtyChai = require('dirty-chai') const isCI = require('electron').remote.getGlobal('isCi') +const {expect} = chai +chai.use(dirtyChai) + describe('globalShortcut module', () => { before(function () { if (isCI && process.platform === 'win32') { @@ -17,16 +21,16 @@ describe('globalShortcut module', () => { it('can register and unregister accelerators', () => { const accelerator = 'CommandOrControl+A+B+C' - assert.equal(globalShortcut.isRegistered(accelerator), false) + expect(globalShortcut.isRegistered(accelerator)).to.be.false() globalShortcut.register(accelerator, () => {}) - assert.equal(globalShortcut.isRegistered(accelerator), true) + expect(globalShortcut.isRegistered(accelerator)).to.be.true() globalShortcut.unregister(accelerator) - assert.equal(globalShortcut.isRegistered(accelerator), false) + expect(globalShortcut.isRegistered(accelerator)).to.be.false() - assert.equal(globalShortcut.isRegistered(accelerator), false) + expect(globalShortcut.isRegistered(accelerator)).to.be.false() globalShortcut.register(accelerator, () => {}) - assert.equal(globalShortcut.isRegistered(accelerator), true) + expect(globalShortcut.isRegistered(accelerator)).to.be.true() globalShortcut.unregisterAll() - assert.equal(globalShortcut.isRegistered(accelerator), false) + expect(globalShortcut.isRegistered(accelerator)).to.be.false() }) }) diff --git a/spec/api-in-app-purchase-spec.js b/spec/api-in-app-purchase-spec.js index 4ebc02f2c797..3756139661bb 100644 --- a/spec/api-in-app-purchase-spec.js +++ b/spec/api-in-app-purchase-spec.js @@ -1,6 +1,10 @@ 'use strict' -const assert = require('assert') +const chai = require('chai') +const dirtyChai = require('dirty-chai') + +const {expect} = chai +chai.use(dirtyChai) const {remote} = require('electron') @@ -12,38 +16,45 @@ describe('inAppPurchase module', function () { const {inAppPurchase} = remote it('canMakePayments() does not throw', () => { - inAppPurchase.canMakePayments() + expect(() => { + inAppPurchase.canMakePayments() + }).to.not.throw() }) it('finishAllTransactions() does not throw', () => { - inAppPurchase.finishAllTransactions() + expect(() => { + inAppPurchase.finishAllTransactions() + }).to.not.throw() }) it('finishTransactionByDate() does not throw', () => { - inAppPurchase.finishTransactionByDate(new Date().toISOString()) + expect(() => { + inAppPurchase.finishTransactionByDate(new Date().toISOString()) + }).to.not.throw() }) it('getReceiptURL() returns receipt URL', () => { - assert.ok(inAppPurchase.getReceiptURL().endsWith('_MASReceipt/receipt')) + const correctUrlEnd = inAppPurchase.getReceiptURL().endsWith('_MASReceipt/receipt') + expect(correctUrlEnd).to.be.true() }) - it('purchaseProduct() fails when buying invalid product', (done) => { - inAppPurchase.purchaseProduct('non-exist', 1, (success) => { - assert.ok(!success) + it('purchaseProduct() fails when buying invalid product', done => { + inAppPurchase.purchaseProduct('non-exist', 1, success => { + expect(success).to.be.false() done() }) }) - it('purchaseProduct() accepts optional arguments', (done) => { + it('purchaseProduct() accepts optional arguments', done => { inAppPurchase.purchaseProduct('non-exist', () => { inAppPurchase.purchaseProduct('non-exist', 1) done() }) }) - it('getProducts() returns an empty list when getting invalid product', (done) => { - inAppPurchase.getProducts(['non-exist'], (products) => { - assert.ok(products.length === 0) + it('getProducts() returns an empty list when getting invalid product', done => { + inAppPurchase.getProducts(['non-exist'], products => { + expect(products).to.be.an('array').of.length(0) done() }) })