Integrated tests of both source modules

Decided on using node-tap and integrated the tests from soft-delete into timestamp origins
jouke · Oct 26, 2016 · 76c3f2d · 76c3f2d
1 parent 48230ae
commit 76c3f2d
Show file tree

Hide file tree

Showing 11 changed files with 476 additions and 478 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ npm-debug.log
 /index.js
 /auditz.js
 *.map
-.nyc_output
+.nyc_output
+.coveralls.yml
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "compile": "gulp babel",
     "prepublish": "npm run compile",
     "pretest": "eslint ./src/*.js && gulp babel",
-    "test": "_mocha --compilers js:babel-core/register && nyc tap ./test/ts/*.js",
+    "test": "nyc tap ./test/*.js",
     "watch": "gulp",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "outdated": "npm outdated --depth=0"
@@ -54,7 +54,6 @@
     "babel-plugin-transform-object-rest-spread": "^6.1.18",
     "babel-plugin-transform-runtime": "^6.1.18",
     "babel-preset-es2015": "^6.1.18",
-    "chai": "^3.4.1",
     "coveralls": "latest",
     "eslint": "^1.9.0",
     "eslint-config-airbnb": "^1.0.0",
@@ -65,7 +64,6 @@
     "loopback": "2.x",
     "loopback-boot": "2.x",
     "loopback-datasource-juggler": ">=2.33.2",
-    "mocha": "^2.3.4",
     "nyc": "latest",
     "tap": "latest"
   }

diff --git a/...xtures/simple-app/common/models/widget.js → ...xtures/simple-app/common/models/widget.js b/...xtures/simple-app/common/models/widget.js → ...xtures/simple-app/common/models/widget.js
diff --git a/...ures/simple-app/common/models/widget.json → ...ures/simple-app/common/models/widget.json b/...ures/simple-app/common/models/widget.json → ...ures/simple-app/common/models/widget.json
diff --git a/...ts/fixtures/simple-app/server/config.json → test/fixtures/simple-app/server/config.json b/...ts/fixtures/simple-app/server/config.json → test/fixtures/simple-app/server/config.json
diff --git a/...xtures/simple-app/server/datasources.json → ...xtures/simple-app/server/datasources.json b/...xtures/simple-app/server/datasources.json → ...xtures/simple-app/server/datasources.json
diff --git a/...ixtures/simple-app/server/middleware.json → ...ixtures/simple-app/server/middleware.json b/...ixtures/simple-app/server/middleware.json → ...ixtures/simple-app/server/middleware.json
diff --git a/...tures/simple-app/server/model-config.json → ...tures/simple-app/server/model-config.json b/...tures/simple-app/server/model-config.json → ...tures/simple-app/server/model-config.json
@@ -4,7 +4,7 @@
       "../common/models"
     ],
     "mixins": [
-      "../../../../../"
+      "../../../../"
     ]
   },
   "User": {

diff --git a/test/ts/fixtures/simple-app/server/server.js → test/fixtures/simple-app/server/server.js b/test/ts/fixtures/simple-app/server/server.js → test/fixtures/simple-app/server/server.js