Merge pull request #50 from skellock/touch-up-tests

Cleans up and separates the tests.

Author: skellock

src/main/main-window/main-window.test.ts

@@ -4,49 +4,59 @@ import { stub } from 'sinon'
 import { electron, BrowserWindow } from '../test/mock-electron'
 import { WindowStateManager } from '../test/mock-window-state-manager'
 
-test.beforeEach(() => {
-  mockery.enable({ warnOnUnregistered: false })
+test.beforeEach(() => mockery.enable({ warnOnUnregistered: false }))
+test.afterEach(() => {
+  mockery.deregisterAll()
+  mockery.disable()
 })
 
-test.after.always(() => mockery.disable())
-
-test('reads from the window state manager', t => {
-  // stub the getters of window state manager
+test('reads from window state', t => {
+  // two step process for the getters :(
   const width = stub()
   const height = stub()
   const x = stub()
   const y = stub()
-
-  // stubbed this one with a value to drive thru a branch in that code
-  const maximized = stub().returns(true)
-
-  // override the getters of the window state manager
   stub(WindowStateManager.prototype, 'width').get(width)
   stub(WindowStateManager.prototype, 'height').get(height)
   stub(WindowStateManager.prototype, 'x').get(x)
   stub(WindowStateManager.prototype, 'y').get(y)
-  stub(WindowStateManager.prototype, 'maximized').get(maximized)
-
-  const saveState = stub(WindowStateManager.prototype, 'saveState')
 
-  // mock up the libraries
+  // hijack the 3rd parties
   mockery.registerMock('electron-window-state-manager', WindowStateManager)
-  mockery.registerMock('electron', { ...electron, BrowserWindow })
+  mockery.registerMock('electron', electron)
 
-  // now bring in our library
-  const window: BrowserWindow = require('./main-window').createMainWindow(__dirname)
+  // now we can create our window
+  require('./main-window').createMainWindow(__dirname)
 
-  // window state manager mocks all fired?
-  t.true(maximized.calledOnce)
+  // did our mocks get called?
   t.true(width.calledOnce)
   t.true(height.calledOnce)
   t.true(x.calledOnce)
   t.true(y.calledOnce)
+})
+
+test('maximizes if told by the window state manager', t => {
+  const maximized = stub().returns(true)
+  stub(WindowStateManager.prototype, 'maximized').get(maximized)
+
+  mockery.registerMock('electron-window-state-manager', WindowStateManager)
+  mockery.registerMock('electron', electron)
+
+  require('./main-window').createMainWindow(__dirname)
+
   t.true(maximized.calledOnce)
+})
 
-  // manually trigger the WindowStateManager to save on the known events
+test('saves window state', t => {
+  const saveState = stub(WindowStateManager.prototype, 'saveState')
+
+  mockery.registerMock('electron-window-state-manager', WindowStateManager)
+  mockery.registerMock('electron', electron)
+
+  const window: BrowserWindow = require('./main-window').createMainWindow(__dirname)
   window.emit('close')
   window.emit('move')
   window.emit('resize')
+
   t.is(saveState.callCount, 3)
 })

src/main/test/mock-electron.ts

@@ -1,54 +1,33 @@
 import { stub } from 'sinon'
+import { EventEmitter } from 'events'
 
-interface Events {
-  [eventName: string]: [() => void]
-}
-
-export class WebContents {
-  events: Events = {}
-
-  on(eventName: string, callback: () => void): void {
-    this.events[eventName] = this.events[eventName] || []
-    this.events[eventName].push(callback)
-  }
-
-  emit(eventName: string) {
-    if (this.events[eventName]) {
-      this.events[eventName].forEach(fn => fn())
-    }
-  }
-}
+export class WebContents extends EventEmitter {}
 
 /**
  * Spins up an Electron Browser Window full of stubby goodness.
  */
-export class BrowserWindow {
+export class BrowserWindow extends EventEmitter {
   webContents: WebContents = new WebContents()
-  events: Events = {}
-  constructor() {
-    this.webContents = new WebContents()
-  }
-
-  on(eventName: string, callback: () => void): void {
-    this.events[eventName] = this.events[eventName] || []
-    this.events[eventName].push(callback)
-  }
-
-  emit(eventName: string) {
-    if (this.events[eventName]) {
-      this.events[eventName].forEach(fn => fn())
-    }
-  }
-
   getSize() {}
   loadURL() {}
   maximize() {}
 }
+
+/**
+ * The electron app.
+ */
+export const app = {
+  getName: stub().returns('hi'),
+}
+
+/**
+ * The whole "namespace"
+ */
 export const electron = {
-  app: {
-    getName: stub().returns('hi'),
-  },
+  app,
   BrowserWindow,
 }
 
+// export const app = electron.app
+
 export default electron