Merge pull request #6 from rhysd/fix-removed-module

Fix loading old modules removed in Electron v1.0.0

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "0.12"
+  - "5"
 
 branches:
   only:

index.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var app = require('app');
+var electron = require('electron');
+var app = electron.app;
 var jsonfile = require('jsonfile');
 var path = require('path');
 var mkdirp = require('mkdirp');
 var objectAssign = require('object-assign');
 var deepEqual = require('deep-equal');
 
 module.exports = function (options) {
-  var screen = require('screen');
+  var screen = electron.screen;
   var state;
   var winRef;
   var stateChangeTimer;

test.js

@@ -7,9 +7,12 @@ test.before(() => {
     writeFileSync: function () {},
     readFileSync: function () {}
   };
+  const electronMock = {
+    app: {getPath: function () {return '/temp';}},
+    screen: {getDisplayMatching: function () {}}
+  };
   mockery.registerAllowables(['./', 'path', 'object-assign', 'deep-equal', 'sinon', './lib/keys.js', './lib/is_arguments.js']);
-  mockery.registerMock('app', {getPath: function () {return '/temp';}});
-  mockery.registerMock('screen', {getDisplayMatching: function () {}});
+  mockery.registerMock('electron', electronMock);
   mockery.registerMock('mkdirp', {sync: function () {}});
   mockery.registerMock('jsonfile', jsonfileMock);
   mockery.enable({useCleanCache: true});
@@ -103,7 +106,7 @@ test('saves the state to the file system', t => {
   const jsonfile = require('jsonfile');
   sinon.spy(jsonfile, 'writeFileSync');
 
-  const screen = require('screen');
+  const screen = require('electron').screen;
   sinon.stub(screen, 'getDisplayMatching').returns({bounds: screenBounds});
 
   const state = require('./')({defaultWidth: 1000, defaultHeight: 2000});