From 39e1541a7e5c20dfbd7f98843b789ca055186a78 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 9 Aug 2016 15:05:56 -0700
Subject: [PATCH 1/4] Add initial power save blocker spec

---
 spec/api-power-save-blocker-spec.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 spec/api-power-save-blocker-spec.js

diff --git a/spec/api-power-save-blocker-spec.js b/spec/api-power-save-blocker-spec.js
new file mode 100644
index 000000000000..be97bcb301a6
--- /dev/null
+++ b/spec/api-power-save-blocker-spec.js
@@ -0,0 +1,13 @@
+const {powerSaveBlocker} = require('electron').remote
+const assert = require('assert')
+
+describe('powerSaveBlocker module', () => {
+  it('can be started and stopped', () => {
+    assert.equal(powerSaveBlocker.isStarted(-1), false)
+    const id = powerSaveBlocker.start('prevent-app-suspension')
+    assert.ok(id != null)
+    assert.equal(powerSaveBlocker.isStarted(id), true)
+    powerSaveBlocker.stop(id)
+    assert.equal(powerSaveBlocker.isStarted(id), false)
+  })
+})

From a6353eb98f6cd045bdf246bcbaa37adbdea60303 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 9 Aug 2016 15:10:51 -0700
Subject: [PATCH 2/4] Add initial global shortcut spec

---
 spec/api-global-shortcut-spec.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 spec/api-global-shortcut-spec.js

diff --git a/spec/api-global-shortcut-spec.js b/spec/api-global-shortcut-spec.js
new file mode 100644
index 000000000000..d4f277496c60
--- /dev/null
+++ b/spec/api-global-shortcut-spec.js
@@ -0,0 +1,24 @@
+const {globalShortcut} = require('electron').remote
+const assert = require('assert')
+
+describe('globalShortcut module', () => {
+  beforeEach(() => {
+    globalShortcut.unregisterAll()
+  })
+
+  it('can register and unregister accelerators', () => {
+    const accelerator = 'CommandOrControl+A+B+C'
+
+    assert.equal(globalShortcut.isRegistered(accelerator), false)
+    globalShortcut.register(accelerator, () => {})
+    assert.equal(globalShortcut.isRegistered(accelerator), true)
+    globalShortcut.unregister(accelerator)
+    assert.equal(globalShortcut.isRegistered(accelerator), false)
+
+    assert.equal(globalShortcut.isRegistered(accelerator), false)
+    globalShortcut.register(accelerator, () => {})
+    assert.equal(globalShortcut.isRegistered(accelerator), true)
+    globalShortcut.unregisterAll()
+    assert.equal(globalShortcut.isRegistered(accelerator), false)
+  })
+})

From ce0165367cb92206fcfb224ebce6848b4c642a43 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 9 Aug 2016 15:31:24 -0700
Subject: [PATCH 3/4] Add spec for invalid capture options

---
 spec/api-desktop-capturer-spec.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/api-desktop-capturer-spec.js b/spec/api-desktop-capturer-spec.js
index 35b7248ed5ee..3dce618de00f 100644
--- a/spec/api-desktop-capturer-spec.js
+++ b/spec/api-desktop-capturer-spec.js
@@ -18,6 +18,13 @@ describe('desktopCapturer', function () {
     })
   })
 
+  it('throws an error for invalid options', function (done) {
+    desktopCapturer.getSources(['window', 'screen'], function (error) {
+      assert.equal(error.message, 'Invalid options')
+      done()
+    })
+  })
+
   it('does not throw an error when called more than once (regression)', function (done) {
     var callCount = 0
     var callback = function (error, sources) {

From 2a0eb72334e10e9b67bec0633c96fffe86407a06 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 9 Aug 2016 15:41:46 -0700
Subject: [PATCH 4/4] Add asserts for crash report APIs

---
 spec/api-crash-reporter-spec.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js
index 7b04c27e1f6b..286b7d2f6368 100644
--- a/spec/api-crash-reporter-spec.js
+++ b/spec/api-crash-reporter-spec.js
@@ -10,7 +10,7 @@ const app = remote.require('electron').app
 const crashReporter = remote.require('electron').crashReporter
 const BrowserWindow = remote.require('electron').BrowserWindow
 
-describe('crash-reporter module', function () {
+describe('crashReporter module', function () {
   var fixtures = path.resolve(__dirname, 'fixtures')
   var w = null
 
@@ -53,8 +53,13 @@ describe('crash-reporter module', function () {
         assert.equal(fields['_productName'], 'Zombies')
         assert.equal(fields['_companyName'], 'Umbrella Corporation')
         assert.equal(fields['_version'], app.getVersion())
-        res.end('abc-123-def')
-        done()
+
+        res.end('abc-123-def', () => {
+          assert.equal(crashReporter.getLastCrashReport().id, 'abc-123-def')
+          assert.notEqual(crashReporter.getUploadedReports().length, 0)
+          assert.equal(crashReporter.getUploadedReports()[0].id, 'abc-123-def')
+          done()
+        })
       })
     })
     var port = remote.process.port