Fixes tests

Author: mitchhentges

.eslintrc

@@ -87,7 +87,6 @@
  "no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func
  "no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str
  "no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign
- "no-new": 2, // http://eslint.org/docs/rules/no-new
  "no-new-func": 2, // http://eslint.org/docs/rules/no-new-func
  "no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers
  "no-octal": 2, // http://eslint.org/docs/rules/no-octal

src/common/config.js

@@ -1,10 +1,10 @@
-import { remote, app as mainApp } from 'electron';
+// import { remote, app as mainApp } from 'electron';
 import constants from './constants.js';
-const app = remote ? remote.app : mainApp;
+// const app = remote ? remote.app : mainApp;
 
 export default {
- version: constants.DEV ? 'DEV' : app.getVersion(),
- userData: app.getPath('userData'),
+ version: app => constants.DEV ? 'DEV' : app.getVersion(),
+ userData: app => app.getPath('userData'),
 
  maxLogEntries: 100000,
  proxyPort: 1338,

src/common/service/proxy.js

@@ -1,10 +1,8 @@
 import uniqid from 'uniqid';
 
 export default class Proxy {
- constructor(newRequest, requestCompleted, config, urlMapper, createHoxy) {
- this._requests = [];
+ constructor(newRequest, requestCompleted, urlMapper, createHoxy) {
  this._urlMapper = urlMapper;
- this._config = config;
  this._newRequest = newRequest;
  this._requestCompleted = requestCompleted;
  this._isCachingEnabled = false;

src/common/service/sentry.js

@@ -1,14 +1,14 @@
 import config from '../config.js';
 import constants from '../constants.js';
 
-export default function init(Sentry) {
+export default function init(app, Sentry) {
  if (constants.DEV) {
  return;
  }
 
  const { dsn, host } = config.sentry;
  Sentry.init({
  dsn: `https://${dsn}@${host}`,
- release: config.version
+ release: config.version(app)
  });
 }

src/main/index.js

@@ -12,14 +12,14 @@ import createUrlMapper from './url-mapper.js';
 import createProxy from './proxy.js';
 import autoUpdater from './auto-update.js';
 
-sentryInit(Sentry);
+sentryInit(app, Sentry);
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the javascript object is GCed.
 let mainWindow = null;
 
 console.log('Loading URL mappings...'); // eslint-disable-line no-console
 const urlMapper = createUrlMapper({
- filename: `${config.userData}/data.nedb`,
+ filename: `${config.userData(app)}/data.nedb`,
  autoload: true
 });
 

src/main/proxy.js

@@ -1,6 +1,7 @@
 import hoxy from 'hoxy';
 import fs from 'fs';
 import EventEmitter from 'events';
+import {remote} from 'electron';
 
 import constants from '../common/constants.js';
 import appConfig from '../common/config.js';
@@ -18,18 +19,16 @@ class ProxyHandler extends EventEmitter {
  this.proxy = new Proxy(
  this.onNewRequest_.bind(this),
  this.onRequestCompleted_.bind(this),
- config,
  urlMapper,
- this.createHoxy.bind(this),
- this.isCaching.bind(this)
+ this.createHoxy.bind(this)
  );
  }
 
  createHoxy() {
  const opts = {};
  try {
- const key = fs.readFileSync(`${appConfig.userData}/root-ca.key.pem`);
- const cert = fs.readFileSync(`${appConfig.userData}/root-ca.crt.pem`);
+ const key = fs.readFileSync(`${appConfig.userData(remote.app)}/root-ca.key.pem`);
+ const cert = fs.readFileSync(`${appConfig.userData(remote.app)}/root-ca.crt.pem`);
  opts.certAuthority = {key, cert};
  } catch (e) {
  const [reason] = e.message.split('\n');

src/renderer/component/footer/update-status.js

@@ -1,4 +1,4 @@
-import { shell } from 'electron';
+import { remote, shell } from 'electron';
 
 import React from 'react';
 import PropTypes from 'prop-types';
@@ -16,8 +16,8 @@ const openChangelog = e => launchURL(e, 'https://github.com/james-proxy/james/bl
 const openIssues = e => launchURL(e, 'https://github.com/james-proxy/james/issues');
 
 const statusMap = {
- [constants.UPDATE_OK]: () => ({
- message: `v${config.version}`,
+ [constants.UPDATE_OK]: (info, app) => ({
+ message: `v${config.version(app)}`,
  icon: '',
  title: 'James is up to date',
  onClick: openChangelog
@@ -52,7 +52,7 @@ const statusMap = {
 };
 
 const UpdateStatus = ({status, info}) => {
- const { message, icon, title, onClick } = statusMap[status](info);
+ const { message, icon, title, onClick } = statusMap[status](info, remote.app);
  const classes = `update-status ${status} ${onClick ? 'has-action' : ''}`;
 
  return <div className={classes} title={title} onClick={onClick}>

src/renderer/index.js

@@ -4,7 +4,7 @@ if (!constants.DEV) { // fix for loading async bundles (see electron-userland/el
  __webpack_public_path__ = `file:///${process.resourcesPath}/app.asar/`; // eslint-disable-line camelcase
 }
 
-import { ipcRenderer as ipc } from 'electron';
+import { remote, ipcRenderer as ipc } from 'electron';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
@@ -28,7 +28,7 @@ import App from './containers/app';
 
 import './resources/style/main.scss';
 
-sentryInit(Sentry);
+sentryInit(remote.app, Sentry);
 
 const history = createHistory();
 const store = setupStore(history);

src/renderer/reducers/requests.js

@@ -1,9 +1,9 @@
 import { combineReducers } from 'redux';
 import { createSelector } from 'reselect';
 
-import config from 'common/config.js';
+import config from '../../common/config.js';
 import * as actions from '../../common/actions/requests.js';
-import * as proxyActions from 'common/actions/proxy.js';
+import * as proxyActions from '../../common/actions/proxy.js';
 
 const initialState = {
  filter: null,
@@ -42,7 +42,7 @@ function data(state = initialState.data, action) {
  .slice(0, config.maxLogEntries);
  case actions.COMPLETE_REQUEST:
  return state.map(existingContainer => {
- if (existingContainer.request.id !== action.requestContainer.id) {
+ if (existingContainer.id !== action.requestContainer.id) {
  return existingContainer;
  }
  return action.requestContainer;

test/unit/actions/requests.js

@@ -2,11 +2,7 @@ import assert from 'assert';
 
 import * as actions from '../../../src/common/actions/requests.js';
 
-const request = {
- request: {},
- response: {},
- id: ''
-};
+const requestId = '';
 
 describe('request actions', () => {
  it('should create actions to set the request filter', () => {
@@ -22,41 +18,32 @@ describe('request actions', () => {
  it('should create an action to clear the active request', () => {
  const expectedAction = {
  type: actions.SET_ACTIVE_REQUEST,
- request: null
+ requestId: null
  };
  assert.deepEqual(actions.setActiveRequest(), expectedAction);
  });
 
  it('should create an action to set the active request', () => {
  const expectedAction = {
  type: actions.SET_ACTIVE_REQUEST,
- request
+ requestId
  };
- assert.deepEqual(actions.setActiveRequest(request), expectedAction);
+ assert.deepEqual(actions.setActiveRequest(requestId), expectedAction);
  });
 
  it('should create an action to clear the active context', () => {
  const expectedAction = {
  type: actions.SET_CONTEXT_REQUEST,
- request: null
+ requestId: null
  };
  assert.deepEqual(actions.setContextRequest(), expectedAction);
  });
 
  it('should create an action to set the active context', () => {
  const expectedAction = {
  type: actions.SET_CONTEXT_REQUEST,
- request
+ requestId
  };
- assert.deepEqual(actions.setContextRequest(request), expectedAction);
- });
-
- it('should create an action to sync url mappings', () => {
- const requestData = {};
- const expectedAction = {
- type: actions.SYNC_REQUESTS,
- requestData
- };
- assert.deepEqual(actions.syncRequests({requestData}), expectedAction);
+ assert.deepEqual(actions.setContextRequest(requestId), expectedAction);
  });
 });