Merge branch 'master' into fix-loading-geography-fields

domasx2 · Jun 19, 2020 · 169b81e · 169b81e
2 parents 6f3392e + b7cb47a
commit 169b81e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@ lib-cov
 *.pid
 *.gz
 *sublime*
+# Webstorm project conf files
+.idea/
 
 pids
 logs

diff --git a/lib/loader.js b/lib/loader.js
@@ -246,7 +246,7 @@ Loader.prototype.prepFixtureData = function(data, Model) {
             if (Model.rawAttributes.hasOwnProperty(key)) {
                 result[key] = val;
             } else {
-                console.warn('attribute "' + key +"' not defined on  model '" + Model.name + "'.");
+                self.logger.warn('attribute "' + key +"' not defined on  model '" + Model.name + "'.");
             }
         }
     });

diff --git a/package-lock.json b/package-lock.json