Small reorg of tests

majo44 · May 17, 2017 · 2dfd8cb · 2dfd8cb
1 parent ed86dcc
commit 2dfd8cb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "compile": "tsc",
     "bundle": "webpack --config webpack.config.js",
     "bundle:min": "webpack --config webpack.config.min.js",
-    "test": "nyc mocha test/**/*.spec.js",
+    "test": "nyc mocha test/unit/**/*.spec.js",
     "build": "npm run compile && npm run test && npm run bundle && npm run bundle:min"
   }
 }
diff --git a/test/redyxTx.spec.ts b/test/redyxTx.spec.ts
diff --git a/test/lib/actions.spec.ts → test/unit/lib/actions.spec.ts b/test/lib/actions.spec.ts → test/unit/lib/actions.spec.ts
@@ -1,11 +1,11 @@
-import {expect} from '../utils/expect';
+import {expect} from '../../utils/expect';
 import {
     CANCEL_TRANSACTION_ACTION_TYPE,
     cancelTransactionAction,
     COMMIT_TRANSACTION_ACTION_TYPE, commitTransactionAction, REJECT_TRANSACTION_ACTION_TYPE, rejectTransactionAction,
     START_TRANSACTION_ACTION_TYPE,
     startTransactionAction, TIMEOUT_TRANSACTION_ACTION_TYPE, timeoutTransactionAction
-} from '../../lib/actions';
+} from '../../../lib/actions';
 
 describe('action factory', () => {
 

diff --git a/test/lib/middleware.spec.ts → test/unit/lib/middleware.spec.ts b/test/lib/middleware.spec.ts → test/unit/lib/middleware.spec.ts
@@ -1,10 +1,10 @@
-import {expect} from '../utils/expect';
+import {expect} from '../../utils/expect';
 import 'zone.js';
-import {transactionMiddleware} from '../../lib/middleware';
-import {TRANSACTION_ID_ZONE_KEY} from '../../lib/transaction';
+import {transactionMiddleware} from '../../../lib/middleware';
+import {TRANSACTION_ID_ZONE_KEY} from '../../../lib/transaction';
 import {Dispatch, MiddlewareAPI} from 'redux';
 import * as sinon from "sinon";
-import {START_TRANSACTION_ACTION_TYPE} from '../../lib/actions';
+import {START_TRANSACTION_ACTION_TYPE} from '../../../lib/actions';
 
 
 describe('middleeware', () => {

diff --git a/test/lib/reducer.spec.ts → test/unit/lib/reducer.spec.ts b/test/lib/reducer.spec.ts → test/unit/lib/reducer.spec.ts
@@ -1,11 +1,11 @@
-import {expect} from '../utils/expect';
+import {expect} from '../../utils/expect';
 import * as sinon from "sinon";
 import {Action, Reducer} from 'redux';
-import {transactionReducer} from "../../index";
+import {transactionReducer} from "../../../index";
 import {
     CANCEL_TRANSACTION_ACTION_TYPE, COMMIT_TRANSACTION_ACTION_TYPE, REJECT_TRANSACTION_ACTION_TYPE, START_TRANSACTION_ACTION_TYPE,
     TIMEOUT_TRANSACTION_ACTION_TYPE
-} from '../../lib/actions';
+} from '../../../lib/actions';
 
 
 describe('reducer', () => {

diff --git a/test/lib/transaction.spec.ts → test/unit/lib/transaction.spec.ts b/test/lib/transaction.spec.ts → test/unit/lib/transaction.spec.ts
@@ -1,12 +1,11 @@
-import {expect} from '../utils/expect';
+import {expect} from '../../utils/expect';
 import * as sinon from "sinon";
-import {Dispatch} from 'redux';
-import {setTransactionTimeout, transaction} from '../../lib/transaction';
+import {setTransactionTimeout, transaction} from '../../../lib/transaction';
 import {
     CANCEL_TRANSACTION_ACTION_TYPE, COMMIT_TRANSACTION_ACTION_TYPE, REJECT_TRANSACTION_ACTION_TYPE,
     START_TRANSACTION_ACTION_TYPE, TIMEOUT_TRANSACTION_ACTION_TYPE
-} from '../../lib/actions';
-import {semaphore} from '../utils/promise';
+} from '../../../lib/actions';
+import {semaphore} from '../../utils/promise';
 
 describe('transaction', () => {
     let dispatch: sinon.SinonSpy;

diff --git a/test/lib/utils/optimisticMerge.spec.ts → test/unit/lib/utils/optimisticMerge.spec.ts b/test/lib/utils/optimisticMerge.spec.ts → test/unit/lib/utils/optimisticMerge.spec.ts
@@ -1,5 +1,5 @@
-import {expect} from '../../utils/expect';
-import {optimisticMerge} from '../../../lib/utils/optimisticMerge';
+import {expect} from '../../../utils/expect';
+import {optimisticMerge} from '../../../../lib/utils/optimisticMerge';
 
 describe('optimisticMerge', () => {