Merge pull request #190 from StackStorm/fix-scripts-loading

Fix scripts loading

Author: blag

src/stackstorm_api.js src/lib/stackstorm_api.js

@@ -33,10 +33,10 @@ var _ = require('lodash'),
   util = require('util'),
   env = _.clone(process.env),
   Promise = require('rsvp').Promise,
-  utils = require('./lib/utils.js'),
-  formatCommand = require('./lib/format_command.js'),
-  CommandFactory = require('./lib/command_factory.js'),
-  adapters = require('./lib/adapters'),
+  utils = require('./utils.js'),
+  formatCommand = require('./format_command.js'),
+  CommandFactory = require('./command_factory.js'),
+  adapters = require('./adapters'),
   st2client = require('st2client'),
   uuid = require('uuid')
   ;

src/stackstorm.js

@@ -30,7 +30,7 @@
 "use strict";
 
 var env = process.env;
-var StackStormApi = require('./stackstorm_api');
+var StackStormApi = require('./lib/stackstorm_api');
 
 module.exports = function (robot) {
   var stackstormApi = new StackStormApi(robot);

test/test-st2-invalid-auth.js

@@ -51,7 +51,7 @@ describe("invalid st2 credential configuration", function() {
     // Remove stackstorm.js from the require cache
     // https://medium.com/@gattermeier/invalidate-node-js-require-cache-c2989af8f8b0
     delete require.cache[require.resolve("../src/stackstorm.js")];
-    delete require.cache[require.resolve("../src/stackstorm_api.js")];
+    delete require.cache[require.resolve("../src/lib/stackstorm_api.js")];
   });
 
   it("should error out with missing auth URL", function(done) {

test/test-st2-unauthorized.js

@@ -64,7 +64,7 @@ describe("auth with invalid st2 API key", function() {
     // Remove stackstorm.js from the require cache
     // https://medium.com/@gattermeier/invalidate-node-js-require-cache-c2989af8f8b0
     delete require.cache[require.resolve("../src/stackstorm.js")];
-    delete require.cache[require.resolve("../src/stackstorm_api.js")];
+    delete require.cache[require.resolve("../src/lib/stackstorm_api.js")];
     var stackstorm = require("../src/stackstorm.js");
     stackstorm(robot).then(function (result) {
       stop = result;
@@ -80,7 +80,7 @@ describe("auth with invalid st2 API key", function() {
     // Remove stackstorm.js from the require cache
     // https://medium.com/@gattermeier/invalidate-node-js-require-cache-c2989af8f8b0
     delete require.cache[require.resolve("../src/stackstorm.js")];
-    delete require.cache[require.resolve("../src/stackstorm_api.js")];
+    delete require.cache[require.resolve("../src/lib/stackstorm_api.js")];
   });
 
   // CAUTION: These tests are brittle - do not move them around, remove

test/test-st2bot-envvars.js

@@ -40,7 +40,7 @@ describe("environment variable configuration", function () {
     // Remove stackstorm.js from the require cache
     // https://medium.com/@gattermeier/invalidate-node-js-require-cache-c2989af8f8b0
     delete require.cache[require.resolve("../src/stackstorm.js")];
-    delete require.cache[require.resolve("../src/stackstorm_api.js")];
+    delete require.cache[require.resolve("../src/lib/stackstorm_api.js")];
   });
 
   afterEach(function() {
@@ -52,7 +52,7 @@ describe("environment variable configuration", function () {
     // Remove stackstorm.js from the require cache
     // https://medium.com/@gattermeier/invalidate-node-js-require-cache-c2989af8f8b0
     delete require.cache[require.resolve("../src/stackstorm.js")];
-    delete require.cache[require.resolve("../src/stackstorm_api.js")];
+    delete require.cache[require.resolve("../src/lib/stackstorm_api.js")];
     if (robot) {
       robot.shutdown();
       if (robot.server) {