From 2dfd8cb70237c4ea5365f6a83b1136e45bf34d52 Mon Sep 17 00:00:00 2001
From: "Pawel.Majewski" <pmajewski@contour-technology.com>
Date: Thu, 18 May 2017 00:24:11 +0200
Subject: [PATCH] Small reorg of tests

---
 package.json                                      | 2 +-
 test/redyxTx.spec.ts                              | 0
 test/{ => unit}/lib/actions.spec.ts               | 4 ++--
 test/{ => unit}/lib/middleware.spec.ts            | 8 ++++----
 test/{ => unit}/lib/reducer.spec.ts               | 6 +++---
 test/{ => unit}/lib/transaction.spec.ts           | 9 ++++-----
 test/{ => unit}/lib/utils/optimisticMerge.spec.ts | 4 ++--
 7 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100644 test/redyxTx.spec.ts
 rename test/{ => unit}/lib/actions.spec.ts (95%)
 rename test/{ => unit}/lib/middleware.spec.ts (90%)
 rename test/{ => unit}/lib/reducer.spec.ts (97%)
 rename test/{ => unit}/lib/transaction.spec.ts (96%)
 rename test/{ => unit}/lib/utils/optimisticMerge.spec.ts (94%)

diff --git a/package.json b/package.json
index 5f21fa6..e682c50 100644
--- 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
deleted file mode 100644
index e69de29..0000000
diff --git a/test/lib/actions.spec.ts b/test/unit/lib/actions.spec.ts
similarity index 95%
rename from test/lib/actions.spec.ts
rename to test/unit/lib/actions.spec.ts
index 16e15b6..8573685 100644
--- a/test/lib/actions.spec.ts
+++ b/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 b/test/unit/lib/middleware.spec.ts
similarity index 90%
rename from test/lib/middleware.spec.ts
rename to test/unit/lib/middleware.spec.ts
index 5d34c0b..70c22c0 100644
--- a/test/lib/middleware.spec.ts
+++ b/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 b/test/unit/lib/reducer.spec.ts
similarity index 97%
rename from test/lib/reducer.spec.ts
rename to test/unit/lib/reducer.spec.ts
index 4145f26..4aa8777 100644
--- a/test/lib/reducer.spec.ts
+++ b/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 b/test/unit/lib/transaction.spec.ts
similarity index 96%
rename from test/lib/transaction.spec.ts
rename to test/unit/lib/transaction.spec.ts
index 8b568cd..175fa12 100644
--- a/test/lib/transaction.spec.ts
+++ b/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 b/test/unit/lib/utils/optimisticMerge.spec.ts
similarity index 94%
rename from test/lib/utils/optimisticMerge.spec.ts
rename to test/unit/lib/utils/optimisticMerge.spec.ts
index acf3e63..1fe78c5 100644
--- a/test/lib/utils/optimisticMerge.spec.ts
+++ b/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', () => {