Resolved merge conficts

szokodiakos · Oct 19, 2017 · bc04521 · bc04521
2 parents 7644805 + 7253ee2
commit bc04521
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,15 +1,15 @@
 {
   "name": "typegoose",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "description": "Define Mongoose models using TypeScript classes.",
   "main": "lib/typegoose.js",
   "scripts": {
     "start": "npm run build && node ./lib/typegoose.js",
     "build": "rimraf lib && tsc",
     "lint": "tslint --type-check --project tsconfig.json",
     "test": "npm run lint && npm run cover",
-    "mocha": "npm run build && mocha ./lib/test/**/*.test.js",
-    "cover": "npm run build && istanbul cover node_modules/mocha/bin/_mocha -- ./lib/test/**/*.test.js -R spec",
+    "mocha": "npm run build && mocha ./lib --recursive",
+    "cover": "npm run build && istanbul cover _mocha -- lib --recursive -R spec",
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
   "repository": {

diff --git a/src/typegoose.ts b/src/typegoose.ts
@@ -65,6 +65,8 @@ export class Typegoose {
     const staticMethods = methods.staticMethods[name];
     if (staticMethods) {
       sch.statics = Object.assign(staticMethods, sch.statics || {});
+    } else {
+      sch.statics = sch.statics || {};
     }
 
     const instanceMethods = methods.instanceMethods[name];