Change sails.config.controllers.actions to `sails.config.controller…

…s.moduleDefinitions`.
balderdashy · Oct 21, 2016 · 4ad23dd · 4ad23dd
1 parent 56efaf7
commit 4ad23dd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/lib/app/private/controller/load-modules.js b/lib/app/private/controller/load-modules.js
@@ -122,8 +122,8 @@ module.exports = function (results, cb) {
       sails.log.warn('----------------------------------------------------------------------------\n');
     }
 
-    // Merge stuff from sails.config.controllers.actions on top of any loaded files.
-    _.each(_.get(sails, 'config.controllers.actions') || {}, function(action, actionIdentity) {
+    // Merge stuff from sails.config.controllers.moduleDefinitions on top of any loaded files.
+    _.each(_.get(sails, 'config.controllers.moduleDefinitions') || {}, function(action, actionIdentity) {
       sails._controller.registerAction(action, actionIdentity, true);
     });
 

diff --git a/test/integration/hook.blueprints.action.routes.test.js b/test/integration/hook.blueprints.action.routes.test.js
@@ -59,7 +59,7 @@ describe('blueprints :: ', function() {
         },
         log: {level: 'error'},
         controllers: {
-          actions: {
+          moduleDefinitions: {
             'toplevellegacy/fnaction': function (req, res) { res.send('legacy fn action!'); },
             'toplevellegacy/machineaction': { exits: {success: {example: 'abc123'} }, fn: function (inputs, exits) { exits.success('legacy machine action!'); } },
             'top-level-standalone-fn': function (req, res) { res.send('top level standalone fn!'); },

diff --git a/test/integration/hook.blueprints.index.routes.test.js b/test/integration/hook.blueprints.index.routes.test.js
@@ -53,7 +53,7 @@ describe('blueprints :: ', function() {
       },
       log: {level: 'error'},
       controllers: {
-        actions: {
+        moduleDefinitions: {
           'index': function (req, res) { res.send('top-level index!'); },
           'secondlevel/index': function (req, res) { res.send('second-level index!'); },
           'thirdlevel/index': function (req, res) { res.send('third-level index!'); },

diff --git a/test/integration/hook.blueprints.restful.routes.test.js b/test/integration/hook.blueprints.restful.routes.test.js
@@ -760,7 +760,7 @@ describe('blueprints :: ', function() {
             }
           },
           controllers: {
-            actions: {
+            moduleDefinitions: {
               'user/find': function(req, res) {
                 return res.send('find dem users!');
               }

diff --git a/test/integration/hook.blueprints.shortcut.routes.test.js b/test/integration/hook.blueprints.shortcut.routes.test.js
@@ -685,7 +685,7 @@ describe('blueprints :: ', function() {
             }
           },
           controllers: {
-            actions: {
+            moduleDefinitions: {
               'user/find': function(req, res) {
                 return res.send('find dem users!');
               }

diff --git a/test/integration/hook.policies.test.js b/test/integration/hook.policies.test.js
@@ -86,7 +86,7 @@ describe('policies :: ', function() {
           },
           log: {level: 'silent'},
           controllers: {
-            actions: {
+            moduleDefinitions: {
               'user': function(req, res) { return res.send('user'); },
               'user/foo': function(req, res) { return res.send('user.foo'); },
               'user/foo/bar': function(req, res) { return res.send('user.foo.bar'); }
@@ -343,7 +343,7 @@ describe('policies :: ', function() {
           },
           log: {level: 'silent'},
           controllers: {
-            actions: {
+            moduleDefinitions: {
               'user': function(req, res) { return res.json({action: 'user', animals: {cat: req.options.cat, owl: req.options.owl}}); },
               'user/foo': function(req, res) { return res.json({action: 'user.foo', animals: {cat: req.options.cat, owl: req.options.owl}}); },
               'user/foo/bar': function(req, res) { return res.json({action: 'user.foo.bar', animals: {cat: req.options.cat, owl: req.options.owl}}); }
@@ -503,7 +503,7 @@ describe('policies :: ', function() {
           },
           log: {level: 'silent'},
           controllers: {
-            actions: {
+            moduleDefinitions: {
               'user': function(req, res) { return res.json({action: 'user', foo: req.options.foo, animals: {cat: req.options.cat, owl: req.options.owl}}); },
               'user/foo': function(req, res) { return res.json({action: 'user/foo', foo: req.options.foo,  animals: {cat: req.options.cat, owl: req.options.owl}}); },
               'user/foo/bar': function(req, res) { return res.json({action: 'user/foo/bar', foo: req.options.foo, animals: {cat: req.options.cat, owl: req.options.owl}}); }