Add initial touch bar specs

kevinsawicki · kevinsawicki · commit c349aeff8095 · 2017-03-03T14:00:39.000-08:00
diff --git a/docs/api/touch-bar.md b/docs/api/touch-bar.md
@@ -13,9 +13,6 @@ Creates a new touch bar with the specified items. Use
 
 ## Examples
 
-The `TouchBar` class is only available in the main process, it is not currently
-possible to use in the renderer process **even** through the remote module.
-
 Below is an example of a simple slot machine touch bar game with a button
 and some labels.
 
diff --git a/lib/browser/api/touch-bar.js b/lib/browser/api/touch-bar.js
@@ -24,7 +24,7 @@ class TouchBar extends EventEmitter {
     super()
 
     if (!Array.isArray(items)) {
-      throw new Error('The items object provided has to be an array')
+      throw new Error('Must specify items array as first argument')
     }
 
     this.windowListeners = {}
@@ -42,7 +42,7 @@ class TouchBar extends EventEmitter {
     }
     items.forEach((item) => {
       if (!(item instanceof TouchBarItem)) {
-        throw new Error('Each item must be an instance of a TouchBarItem')
+        throw new Error('Each item must be an instance of TouchBarItem')
       }
       this.ordereredItems.push(item)
       registerItem(item)
@@ -121,7 +121,9 @@ TouchBar.TouchBarButton = class TouchBarButton extends TouchBarItem {
     this._addLiveProperty('backgroundColor', backgroundColor)
     this._addLiveProperty('icon', icon)
     if (typeof click === 'function') {
-      this.onInteraction = config.click
+      this.onInteraction = () => {
+        config.click()
+      }
     }
   }
 }
diff --git a/spec/api-touch-bar-spec.js b/spec/api-touch-bar-spec.js
@@ -0,0 +1,50 @@
+const assert = require('assert')
+const {BrowserWindow, TouchBar} = require('electron').remote
+const {closeWindow} = require('./window-helpers')
+
+const {TouchBarButton, TouchBarColorPicker, TouchBarGroup} = TouchBar
+const {TouchBarLabel, TouchBarPopover, TouchBarSlider, TouchBarSpacer} = TouchBar
+
+describe('TouchBar module', function () {
+  it('throws an error when created without an items array', function () {
+    assert.throws(() => {
+      const touchBar = new TouchBar()
+      touchBar.toString()
+    }, /Must specify items array as first argument/)
+  })
+
+  it('throws an error when created with invalid items', function () {
+    assert.throws(() => {
+      const touchBar = new TouchBar([1, true, {}, []])
+      touchBar.toString()
+    }, /Each item must be an instance of TouchBarItem/)
+  })
+
+  describe('BrowserWindow behavior', function () {
+    let window
+
+    beforeEach(function () {
+      window = new BrowserWindow()
+    })
+
+    afterEach(function () {
+      window.setTouchBar(null)
+      return closeWindow(window).then(function () { window = null })
+    })
+
+    it('can be added to and removed from a window', function () {
+      const touchBar = new TouchBar([
+        new TouchBarButton({label: 'foo', backgroundColor: '#F00', click: () => {}}),
+        new TouchBarColorPicker({selectedColor: '#F00', change: () => {}}),
+        new TouchBarGroup({items: new TouchBar([new TouchBarLabel({label: 'hello'})])}),
+        new TouchBarLabel({label: 'bar'}),
+        new TouchBarPopover({items: new TouchBar([new TouchBarButton({label: 'pop'})])}),
+        new TouchBarSlider({label: 'slide', value: 5, minValue: 2, maxValue: 75, change: () => {}}),
+        new TouchBarSpacer({size: 'large'})
+      ])
+      window.setTouchBar(touchBar)
+      window.setTouchBar()
+      window.setTouchBar(new TouchBar([new TouchBarLabel({label: 'two'})]))
+    })
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class TouchBar extends EventEmitter {`
`24`	`24`	`super()`
`25`	`25`
`26`	`26`	`if (!Array.isArray(items)) {`
`27`		`- throw new Error('The items object provided has to be an array')`
	`27`	`+ throw new Error('Must specify items array as first argument')`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`this.windowListeners = {}`
`@@ -42,7 +42,7 @@ class TouchBar extends EventEmitter {`
`42`	`42`	`}`
`43`	`43`	`items.forEach((item) => {`
`44`	`44`	`if (!(item instanceof TouchBarItem)) {`
`45`		`- throw new Error('Each item must be an instance of a TouchBarItem')`
	`45`	`+ throw new Error('Each item must be an instance of TouchBarItem')`
`46`	`46`	`}`
`47`	`47`	`this.ordereredItems.push(item)`
`48`	`48`	`registerItem(item)`
`@@ -121,7 +121,9 @@ TouchBar.TouchBarButton = class TouchBarButton extends TouchBarItem {`
`121`	`121`	`this._addLiveProperty('backgroundColor', backgroundColor)`
`122`	`122`	`this._addLiveProperty('icon', icon)`
`123`	`123`	`if (typeof click === 'function') {`
`124`		`- this.onInteraction = config.click`
	`124`	`+ this.onInteraction = () => {`
	`125`	`+ config.click()`
	`126`	`+ }`
`125`	`127`	`}`
`126`	`128`	`}`
`127`	`129`	`}`