cleanup test directory layout

package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "build-docs": "./scripts/update-gh-pages.sh",
     "serve-docs": "./node_modules/.bin/gitbook serve",
-    "test": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --renderer --retries 2 --compilers js:babel-register --recursive test/**/*.js",
+    "test": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --renderer --retries 2 --compilers js:babel-register --recursive test/",
     "test-debug": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 mocha --retries 2 --compilers js:babel-register --recursive --require ./test/setup.js test/**/*.js --inspect --debug-brk",
     "test-all": "npm run lint && npm run test && npm run build",
     "test-e2e": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 mocha --retries 2 --compilers js:babel-register --require ./test/setup.js ./test/e2e.js",

test/actions/async.test.js → test/app/actions/async.test.js

@@ -23,19 +23,19 @@ import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { expect } from 'chai';
 
-import * as actionSources from '../../app/constants/actionSources';
-import * as actionTypes from '../../app/constants/actionTypes';
-import * as metrics from '../../app/constants/metrics';
-import { pages, steps, urls } from '../../app/constants/otherConstants';
-import { UnsupportedError } from '../../app/utils/errors';
-import errorText from '../../app/constants/errors';
+import * as actionSources from '../../../app/constants/actionSources';
+import * as actionTypes from '../../../app/constants/actionTypes';
+import * as metrics from '../../../app/constants/metrics';
+import { pages, steps, urls } from '../../../app/constants/otherConstants';
+import { UnsupportedError } from '../../../app/utils/errors';
+import errorText from '../../../app/constants/errors';
 
-import * as asyncActions from '../../app/actions/async';
-import { __Rewire__, __ResetDependency__ } from '../../app/actions/async';
-import { getLoginErrorMessage, getLogoutErrorMessage, getUpdateProfileErrorMessage, getCreateCustodialAccountErrorMessage } from '../../app/utils/errors';
+import * as asyncActions from '../../../app/actions/async';
+import { __Rewire__, __ResetDependency__ } from '../../../app/actions/async';
+import { getLoginErrorMessage, getLogoutErrorMessage, getUpdateProfileErrorMessage, getCreateCustodialAccountErrorMessage } from '../../../app/utils/errors';
 
-let pwd = require('../browser/fixtures/pwd.json');
-let nonpwd = require('../browser/fixtures/nonpwd.json');
+let pwd = require('../../lib/fixtures/pwd.json');
+let nonpwd = require('../../lib/fixtures/nonpwd.json');
 
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);

test/actions/sync.test.js → test/app/actions/sync.test.js

@@ -21,15 +21,15 @@ import _ from 'lodash';
 import { isFSA } from 'flux-standard-action';
 import { expect } from 'chai';
 
-import * as actionSources from '../../app/constants/actionSources';
-import * as actionTypes from '../../app/constants/actionTypes';
-import * as metrics from '../../app/constants/metrics';
-import { steps } from '../../app/constants/otherConstants';
-
-import * as syncActions from '../../app/actions/sync';
-import { __Rewire__, __ResetDependency__ } from '../../app/actions/sync';
-import { UnsupportedError } from '../../app/utils/errors';
-import errorText from '../../app/constants/errors';
+import * as actionSources from '../../../app/constants/actionSources';
+import * as actionTypes from '../../../app/constants/actionTypes';
+import * as metrics from '../../../app/constants/metrics';
+import { steps } from '../../../app/constants/otherConstants';
+
+import * as syncActions from '../../../app/actions/sync';
+import { __Rewire__, __ResetDependency__ } from '../../../app/actions/sync';
+import { UnsupportedError } from '../../../app/utils/errors';
+import errorText from '../../../app/constants/errors';
 
 describe('Synchronous Actions', () => {
   describe('addTargetDevice', () => {

test/actions/utils.test.js → test/app/actions/utils.test.js

@@ -23,9 +23,9 @@ import { expect } from 'chai';
 
 import configureStore from 'redux-mock-store';
 
-import errorText from '../../app/constants/errors';
-import * as utils from '../../app/actions/utils';
-import { addInfoToError } from '../../app/utils/errors';
+import errorText from '../../../app/constants/errors';
+import * as utils from '../../../app/actions/utils';
+import { addInfoToError } from '../../../app/utils/errors';
 
 describe('utils', () => {
   describe('makeUploadCb', () => {

test/reducers/misc.test.js → test/app/reducers/misc.test.js

@@ -21,16 +21,16 @@ import _ from 'lodash';
 import mutationTracker from 'object-invariant-test-helper';
 import { expect } from 'chai';
 
-import * as actionTypes from '../../app/constants/actionTypes';
-import { pages, steps } from '../../app/constants/otherConstants';
-import * as misc from '../../app/reducers/misc';
+import * as actionTypes from '../../../app/constants/actionTypes';
+import { pages, steps } from '../../../app/constants/otherConstants';
+import * as misc from '../../../app/reducers/misc';
 
-import devices from '../../app/reducers/devices';
+import devices from '../../../app/reducers/devices';
 
-import { UnsupportedError } from '../../app/utils/errors';
+import { UnsupportedError } from '../../../app/utils/errors';
 
-let pwd = require('../browser/fixtures/pwd.json');
-let nonpwd = require('../browser/fixtures/nonpwd.json');
+let pwd = require('../../lib/fixtures/pwd.json');
+let nonpwd = require('../../lib/fixtures/nonpwd.json');
 
 describe('misc reducers', () => {
   describe('devices', () => {

test/reducers/uploads.test.js → test/app/reducers/uploads.test.js

@@ -20,9 +20,9 @@
 import _ from 'lodash';
 import { expect } from 'chai';
 
-import * as actionTypes from '../../app/constants/actionTypes';
-import { steps } from '../../app/constants/otherConstants';
-import * as uploads from '../../app/reducers/uploads';
+import * as actionTypes from '../../../app/constants/actionTypes';
+import { steps } from '../../../app/constants/otherConstants';
+import * as uploads from '../../../app/reducers/uploads';
 
 describe('uploads', () => {
   describe('uploadProgress', () => {

test/reducers/users.test.js → test/app/reducers/users.test.js

@@ -21,8 +21,8 @@ import _ from 'lodash';
 import mutationTracker from 'object-invariant-test-helper';
 import { expect } from 'chai';
 
-import * as actionTypes from '../../app/constants/actionTypes';
-import * as users from '../../app/reducers/users';
+import * as actionTypes from '../../../app/constants/actionTypes';
+import * as users from '../../../app/reducers/users';
 
 describe('users', () => {
   describe('allUsers', () => {