Added tests for models in different schemas

Some tests refactoring
More code coverage

Author: KSDaemon

index.js

@@ -133,7 +133,7 @@ module.exports = sails => {
             for (modelName in models) {
                 modelDef = models[modelName];
                 this.setAssociation(modelDef);
-                this.setDefaultScope(modelDef);
+                this.setDefaultScope(modelDef, sails.models[modelDef.globalId.toLowerCase()]);
             }
         },
 
@@ -146,10 +146,9 @@ module.exports = sails => {
             }
         },
 
-        setDefaultScope (modelDef) {
+        setDefaultScope (modelDef, model) {
             if (modelDef.defaultScope !== null) {
                 sails.log.verbose('Loading default scope for \'' + modelDef.globalId + '\'');
-                const model = global[modelDef.globalId];
                 if (typeof modelDef.defaultScope === 'function') {
                     const defaultScope = modelDef.defaultScope() || {};
                     model.addScope('defaultScope', defaultScope, { override: true });

test/bootstrap.v0.12-create-db-schemes.test.js

@@ -0,0 +1,50 @@
+describe('Sails.js v0.12 Sequelize hook tests with db schemes (psql)', () => {
+
+    let Sails, rc, sails;
+
+    // Before running any tests, attempt to lift Sails
+    before(function (done) {
+
+        // Hook will timeout in 10 seconds
+        this.timeout(11000);
+
+        const Sequelize = require('sequelize'),
+            connInfo = require('./fixtures/v0.12-create-db-schemes-app/config/connections').connections.somePostgresqlServer;
+
+        let connection = new Sequelize(connInfo.url, connInfo.options);
+
+        // Drop schemas if exists
+        connection.query('DROP SCHEMA IF EXISTS sails, sails_img CASCADE;').then(() => {
+            Sails = require('./fixtures/v0.12-create-db-schemes-app/app').sails;
+            rc = require('rc');
+
+            const config = rc('sails');
+            config.hooks.sequelize = require('../index');
+
+            // Attempt to lift sails
+            Sails().lift(config, (err, _sails) => {
+                if (err) { return done(err); }
+                sails = _sails;
+                return done(err, sails);
+            });
+        });
+
+    });
+
+    // Test that Sails can lift with the hook in place
+    it('sails does not crash', () => true);
+
+    require('./unit/create.test');
+    require('./unit/associations.test');
+    require('./unit/scope.test');
+
+    after(done => {
+        sails.lower(err => {
+            if (err) {
+                return console.log('Error occurred lowering Sails app: ', err);
+            }
+            console.log('Sails app lowered successfully!');
+            done();
+        });
+    });
+});

test/bootstrap.v0.12-db-schemes.test.js renamed to test/bootstrap.v0.12-many-schemes.test.js

@@ -9,13 +9,13 @@ describe('Sails.js v0.12 Sequelize hook tests with db schemes (psql)', () => {
         this.timeout(11000);
 
         const Sequelize = require('sequelize'),
-            connInfo = require('./fixtures/v0.12-db-schemes-app/config/connections').connections.somePostgresqlServer;
+            connInfo = require('./fixtures/v0.12-many-schemes-app/config/connections').connections.somePostgresqlServer;
 
         let connection = new Sequelize(connInfo.url, connInfo.options);
 
         // Drop schemas if exists
-        connection.query('DROP SCHEMA IF EXISTS sails CASCADE;').then(() => {
-            Sails = require('./fixtures/v0.12-db-schemes-app/app').sails;
+        connection.query('DROP SCHEMA IF EXISTS sails, sails_img CASCADE;').then(() => {
+            Sails = require('./fixtures/v0.12-many-schemes-app/app').sails;
             rc = require('rc');
 
             const config = rc('sails');

test/fixtures/v0.12-db-schemes-app/.gitignore renamed to test/fixtures/v0.12-create-db-schemes-app/.gitignore

@@ -0,0 +1,45 @@
+/**
+ * User.js
+ *
+ * @description :: TODO: You might write a short summary of how this model works and what it represents here.
+ * @docs        :: http://sailsjs.org/#!documentation/models
+ */
+
+module.exports = {
+    attributes  : {
+        name: {
+            type: Sequelize.STRING
+        },
+        age : {
+            type: Sequelize.INTEGER
+        }
+    },
+    associations: function () {
+        User.hasMany(Image, { as: 'images', foreignKey: 'userId' });
+    },
+    defaultScope: function () {
+        return {
+            include: [
+                { model: Image, as: 'images' }
+            ]
+        };
+    },
+    options     : {
+        freezeTableName : false,
+        tableName       : 'user',
+        schema          : 'sails',
+        classMethods    : {
+            oneUniqueClassMethod: function () {
+                return 'User class method';
+            }
+        },
+        instanceMethods : {
+            toJSON: function () {
+                let obj = this.get();
+                obj.ageString = '' + obj.age + ' years';
+                return obj;
+            }
+        },
+        hooks           : {}
+    }
+};

test/fixtures/v0.12-db-schemes-app/.sailsrc renamed to test/fixtures/v0.12-create-db-schemes-app/.sailsrc

@@ -0,0 +1,118 @@
+################################################
+###############  .gitignore   ##################
+################################################
+#
+# This file is only relevant if you are using git.
+#
+# Files which match the splat patterns below will
+# be ignored by git.  This keeps random crap and
+# sensitive credentials from being uploaded to 
+# your repository.  It allows you to configure your
+# app for your machine without accidentally
+# committing settings which will smash the local 
+# settings of  other developers on your team. 
+#
+# Some reasonable defaults are included below,
+# but, of course, you should modify/extend/prune
+# to fit your needs!
+################################################
+
+
+
+
+################################################
+# Local Configuration
+#
+# Explicitly ignore files which contain:
+#
+# 1. Sensitive information you'd rather not push to
+#    your git repository.
+#    e.g., your personal API keys or passwords.
+#
+# 2. Environment-specific configuration
+#    Basically, anything that would be annoying
+#    to have to change every time you do a 
+#    `git pull`
+#    e.g., your local development database, or
+#    the S3 bucket you're using for file uploads
+#    development.
+# 
+################################################
+
+config/local.js
+
+
+
+
+
+################################################
+# Dependencies
+#
+# When releasing a production app, you may 
+# consider including your node_modules and
+# bower_components directory in your git repo,
+# but during development, its best to exclude it,
+# since different developers may be working on
+# different kernels, where dependencies would
+# need to be recompiled anyway.
+#
+# More on that here about node_modules dir:
+# http://www.futurealoof.com/posts/nodemodules-in-git.html
+# (credit Mikeal Rogers, @mikeal)
+#
+# About bower_components dir, you can see this:
+# http://addyosmani.com/blog/checking-in-front-end-dependencies/
+# (credit Addy Osmani, @addyosmani)
+# 
+################################################
+
+node_modules
+bower_components
+
+
+
+
+################################################
+# Sails.js / Waterline / Grunt
+#
+# Files generated by Sails and Grunt, or related
+# tasks and adapters.
+################################################
+.tmp
+dump.rdb
+
+
+
+
+
+################################################
+# Node.js / NPM
+#
+# Common files generated by Node, NPM, and the
+# related ecosystem.
+################################################
+lib-cov
+*.seed
+*.log
+*.out
+*.pid
+npm-debug.log
+
+
+
+
+
+################################################
+# Miscellaneous
+#
+# Common files generated by text editors,
+# operating systems, file systems, etc.
+################################################
+
+*~
+*#
+.DS_STORE
+.netbeans
+nbproject
+.idea
+.node_history

test/fixtures/v0.12-db-schemes-app/api/controllers/.gitkeep renamed to test/fixtures/v0.12-create-db-schemes-app/api/controllers/.gitkeep

@@ -0,0 +1,16 @@
+{
+  "generators": {
+    "modules": {}
+  },
+  "hooks": {
+    "blueprints": false,
+    "grunt": false,
+    "sockets": false,
+    "pubsub": false,
+    "orm": false,
+    "i18n": false
+  },
+  "log": {
+    "level": "verbose"
+  }
+}

test/fixtures/v0.12-db-schemes-app/api/models/.gitkeep renamed to test/fixtures/v0.12-create-db-schemes-app/api/models/.gitkeep

@@ -1,5 +1,5 @@
 /**
- * User.js
+ * Group.js
  *
  * @description :: TODO: You might write a short summary of how this model works and what it represents here.
  * @docs        :: http://sailsjs.org/#!documentation/models
@@ -10,26 +10,27 @@ module.exports = {
         name: {
             type: Sequelize.STRING
         },
-        age : {
-            type: Sequelize.INTEGER
+        role: {
+            type: Sequelize.ENUM('USER', 'ADMIN')
         }
     },
     associations: function () {
-        User.hasMany(Image, { as: 'images', foreignKey: 'userId' });
+        Group.hasMany(User, { as: 'users', foreignKey: 'groupId' });
     },
     defaultScope: function () {
         return {
             include: [
-                { model: Image, as: 'images' }
+                { model: User, as: 'users' }
             ]
         };
     },
     options     : {
         freezeTableName : false,
-        tableName       : 'user',
-        schema          : 'sails',
+        tableName       : 'group',
+        schema          : '',
         classMethods    : {},
         instanceMethods : {},
         hooks           : {}
     }
 };
+

test/fixtures/v0.12-db-schemes-app/api/models/Group.js renamed to test/fixtures/v0.12-create-db-schemes-app/api/models/Group.js

@@ -0,0 +1,26 @@
+/**
+ * Image.js
+ *
+ * @description :: TODO: You might write a short summary of how this model works and what it represents here.
+ * @docs        :: http://sailsjs.org/#!documentation/models
+ */
+
+module.exports = {
+    attributes  : {
+        url: {
+            type: Sequelize.STRING
+        }
+    },
+    associations: function () {
+        Image.belongsTo(User, { foreignKey: 'userId' });
+    },
+    options     : {
+        freezeTableName : false,
+        tableName       : 'image',
+        schema          : 'sails_img',
+        classMethods    : {},
+        instanceMethods : {},
+        hooks           : {}
+    }
+};
+

test/fixtures/v0.12-db-schemes-app/api/models/Image.js renamed to test/fixtures/v0.12-create-db-schemes-app/api/models/Image.js

@@ -0,0 +1,45 @@
+/**
+ * User.js
+ *
+ * @description :: TODO: You might write a short summary of how this model works and what it represents here.
+ * @docs        :: http://sailsjs.org/#!documentation/models
+ */
+
+module.exports = {
+    attributes  : {
+        name: {
+            type: Sequelize.STRING
+        },
+        age : {
+            type: Sequelize.INTEGER
+        }
+    },
+    associations: function () {
+        User.hasMany(Image, { as: 'images', foreignKey: 'userId' });
+    },
+    defaultScope: function () {
+        return {
+            include: [
+                { model: Image, as: 'images' }
+            ]
+        };
+    },
+    options     : {
+        freezeTableName : false,
+        tableName       : 'user',
+        schema          : 'sails',
+        classMethods    : {
+            oneUniqueClassMethod: function () {
+                return 'User class method';
+            }
+        },
+        instanceMethods : {
+            toJSON: function () {
+                let obj = this.get();
+                obj.ageString = '' + obj.age + ' years';
+                return obj;
+            }
+        },
+        hooks           : {}
+    }
+};