From abc3f05cb58bd9fae68ee192caf50c8ad1cdc1fd Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Fri, 20 Feb 2015 15:29:19 -0800 Subject: [PATCH] Fix tests --- package.json | 3 ++- src/Metrics.js | 4 ++-- testenv.js | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 testenv.js diff --git a/package.json b/package.json index 704e606c54..dbf4ea630d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "bugs": "https://github.com/kitematic/kitematic/issues", "scripts": { "start": "gulp", - "test": "jest", + "test": "NODE_PATH=./cache/Atom.app/Contents/Resources/atom/renderer/api/lib:$NODE_PATH jest", "release": "gulp release", "release:beta": "gulp release --beta", "preinstall": "./deps", @@ -26,6 +26,7 @@ ], "jest": { "scriptPreprocessor": "/preprocessor.js", + "setupEnvScriptFile": "/testenv.js", "unmockedModulePathPatterns": [ "tty", "net", diff --git a/src/Metrics.js b/src/Metrics.js index fd5467a0c4..3447f0f577 100644 --- a/src/Metrics.js +++ b/src/Metrics.js @@ -1,9 +1,9 @@ -var app = require('remote').require('app'); var assign = require('object-assign'); var Mixpanel = require('mixpanel'); var uuid = require('node-uuid'); var fs = require('fs'); var path = require('path'); +var util = require('./Util'); var settings; try { @@ -48,7 +48,7 @@ var Metrics = { var os = navigator.userAgent.match(/Mac OS X (\d+_\d+_\d+)/)[1].replace(/_/g, '.'); mixpanel.track(name, assign({ distinct_id: id, - version: app.getVersion(), + version: util.packagejson().version, 'Operating System Version': os, beta: !!settings.beta }, data)); diff --git a/testenv.js b/testenv.js new file mode 100644 index 0000000000..55db09ad7b --- /dev/null +++ b/testenv.js @@ -0,0 +1,15 @@ +var mock = (function() { + var store = {}; + return { + getItem: function(key) { + return store[key]; + }, + setItem: function(key, value) { + store[key] = value.toString(); + }, + clear: function() { + store = {}; + } + }; +})(); +Object.defineProperty(window, 'localStorage', { value: mock });