Merge remote-tracking branch 'refs/remotes/origin/release'

SierraSoftworks · Feb 22, 2016 · 58affd5 · 58affd5
2 parents d1ff2f2 + cd18c4a
commit 58affd5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,24 +1,25 @@
 language: node_js
+sudo: false
 node_js:
-  - '0.10'
-services:
-  - mongodb
+  - '4.1'
+addons:
+  apt:
+    sources:
+      - mongodb-3.2-precise
+    packages:
+      - mongodb-org-server
+      - mongodb-org-shell
 env:
   - CI_SERVER=1
 addons:
   code_climate:
     repo_token: 9c90177b42d39905ca635b1f6226580dab5799f87f172b66bab4e8df77b67a13
-before_install:
-  - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
-  - echo 'deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.0 multiverse'
-    | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list
-  - echo 'deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.1 multiverse'
-    | sudo tee /etc/apt/sources.list.d/mongodb-org-3.1.list
-  - sudo apt-get update
-  - sudo apt-get install -y mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-tools
 before_script:
-  - until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done
   - mongo --version
+  - mkdir data/db
+  - 'mongo --dbpath=data/db &'
+  - until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done
+  - mongo --eval 'db.hostInfo()'
   - gulp build
 script:
   - gulp ci

diff --git a/lib/ModelHelpers.ts b/lib/ModelHelpers.ts
@@ -116,7 +116,7 @@ export class ModelHelpers<TDocument extends { _id?: any }, TInstance> {
      * @param {any} The document you wish to clone deeply.
      */
     cloneDocument<T>(original: T): T {
-        return _.cloneDeep(original, (value) => {
+        return _.cloneDeepWith(original, (value) => {
            if(Buffer.isBuffer(value)) {
                return value;
            }

diff --git a/typings/DefinitelyTyped/lodash/lodash.d.ts b/typings/DefinitelyTyped/lodash/lodash.d.ts
@@ -10791,7 +10791,7 @@ declare module _ {
          * console.log(shallow[0] === objects[0]);
          * // => true
          */
-        clone<T>(
+        cloneWith<T>(
             value: T,
             customizer: (value: any) => any): T;
     }
@@ -10800,22 +10800,22 @@ declare module _ {
         /**
          * @see _.clone
          */
-        clone(customizer: (value: any) => any): T;
+        cloneWith(customizer: (value: any) => any): T;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
 
         /**
          * @see _.clone
          */
-        clone(customizer: (value: any) => any): T[];
+        cloneWith(customizer: (value: any) => any): T[];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.clone
          */
-        clone(customizer: (value: any) => any): T;
+        cloneWith(customizer: (value: any) => any): T;
     }
 
     //_.cloneDeepWith
@@ -10832,7 +10832,7 @@ declare module _ {
          * @param thisArg The this binding of customizer.
          * @return Returns the deep cloned value.
          */
-        cloneDeep<T>(
+        cloneDeepWith<T>(
             value: T,
             customizer: (value: any) => any): T;
     }
@@ -10841,21 +10841,21 @@ declare module _ {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(customizer: (value: any) => any): T;
+        cloneDeepWith(customizer: (value: any) => any): T;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(customizer: (value: any) => any): T[];
+        cloneDeepWith(customizer: (value: any) => any): T[];
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(customizer: (value: any) => any): T;
+        cloneDeepWith(customizer: (value: any) => any): T;
     }
 
     //_.eq