Merge pull request electron#284 from tiemevanveen/master

Fixes for tests for Windows

Author: zeke

tests/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const Application = require('spectron').Application
+const electron = require('electron')
 const chai = require('chai')
 const chaiAsPromised = require('chai-as-promised')
 const path = require('path')
@@ -16,9 +17,24 @@ describe('demo app', function () {
 
   let app
 
-  const removeStoredPreferences = function () {
+  const getUserDataPath = function () {
     const productName = require('../package').productName
-    const userDataPath = path.join(process.env.HOME, 'Library', 'Application Support', productName)
+    switch (process.platform) {
+      case 'darwin':
+        return path.join(process.env.HOME, 'Library', 'Application Support', productName)
+      case 'win32':
+        return path.join(process.env.APPDATA, productName)
+      case 'freebsd':
+      case 'linux':
+      case 'sunos':
+        return path.join(process.env.HOME, '.config', productName)
+      default:
+        throw new Error(`Unknown userDataPath path for platform ${process.platform}`)
+    }
+  }
+
+  const removeStoredPreferences = function () {
+    const userDataPath = getUserDataPath()
     try {
       fs.unlinkSync(path.join(userDataPath, 'activeDemoButtonId.json'))
     } catch (error) {
@@ -80,7 +96,7 @@ describe('demo app', function () {
 
   const startApp = function () {
     app = new Application({
-      path: path.join(__dirname, '..', 'node_modules', '.bin', 'electron'),
+      path: electron,
       args: [
         path.join(__dirname, '..')
       ],
@@ -105,6 +121,14 @@ describe('demo app', function () {
     }
   })
 
+  it('checks hardcoded path for userData is correct', function () {
+    return app.client.execute(function () {
+      return require('electron').remote.app.getPath('userData')
+    }).then(function (result) {
+      return result.value
+    }).should.eventually.equal(getUserDataPath())
+  })
+
   it('opens a window displaying the about page', function () {
     return app.client.getWindowCount().should.eventually.equal(1)
       .browserWindow.isMinimized().should.eventually.be.false