Skip to content

Fix scripts loading #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blag merged 2 commits into from
Aug 5, 2019
Merged

Fix scripts loading #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f99518
Move stackstorm_api.js to src/lib/
blag Jul 31, 2019
d8dae66
Update imports in tests
blag Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/stackstorm_api.js → src/lib/stackstorm_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
;
Expand Down
2 changes: 1 addition & 1 deletion src/stackstorm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion test/test-st2-invalid-auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions test/test-st2-unauthorized.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/test-st2bot-envvars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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) {
Expand Down