From 186e7bab0ac6ef85809723f17a848641dbe98555 Mon Sep 17 00:00:00 2001 From: blag Date: Thu, 25 Jul 2019 16:22:41 -0700 Subject: [PATCH 1/5] Add lodash as an explicit dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 78db268..bf6b68a 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "dependencies": { "axios": "^0.7.0", "eventsource": "^0.1.4", + "lodash": "^4.17.15", "object.assign": "^1.0.1" }, "devDependencies": { From 770922cea537a35cb25d8af6f5a4c7bc5290d4e0 Mon Sep 17 00:00:00 2001 From: blag Date: Thu, 25 Jul 2019 16:23:13 -0700 Subject: [PATCH 2/5] Restrict the files included in the st2client NPM package to index.js and lib/ --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index bf6b68a..0cf608c 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,10 @@ "engine": { "node": ">=0.11.0" }, + "files": [ + "/index.js", + "/lib" + ], "dependencies": { "axios": "^0.7.0", "eventsource": "^0.1.4", From c2b00c1cadb47d489289722bd8a5e0c55a3dcf6b Mon Sep 17 00:00:00 2001 From: blag Date: Thu, 25 Jul 2019 16:32:18 -0700 Subject: [PATCH 3/5] Lint tests --- tests/test-attributable.js | 6 ++++-- tests/test-deletable.js | 6 ++++-- tests/test-editable.js | 6 ++++-- tests/test-endpoint.js | 5 ++--- tests/test-enumerable.js | 6 ++++-- tests/test-paginatable.js | 6 ++++-- tests/test-readable.js | 6 ++++-- tests/test-repeatable.js | 6 ++++-- tests/test-schedulable.js | 6 ++++-- tests/test-writable.js | 6 ++++-- 10 files changed, 38 insertions(+), 21 deletions(-) diff --git a/tests/test-attributable.js b/tests/test-attributable.js index e70cc13..8066c91 100644 --- a/tests/test-attributable.js +++ b/tests/test-attributable.js @@ -45,7 +45,8 @@ describe('Attributable', function () { var result = api.attribute(1, 'some', {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -59,7 +60,8 @@ describe('Attributable', function () { var result = api.attribute(1, 'some', {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-deletable.js b/tests/test-deletable.js index 3bebdb0..a78268b 100644 --- a/tests/test-deletable.js +++ b/tests/test-deletable.js @@ -45,7 +45,8 @@ describe('Deletable', function () { var result = api.delete(1, {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -59,7 +60,8 @@ describe('Deletable', function () { var result = api.delete(1, {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-editable.js b/tests/test-editable.js index 1c6a092..00323da 100644 --- a/tests/test-editable.js +++ b/tests/test-editable.js @@ -130,7 +130,8 @@ describe('Editable', function () { var result = api.edit(ref, request, query, {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -154,7 +155,8 @@ describe('Editable', function () { var result = api.edit(ref, request, query, {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-endpoint.js b/tests/test-endpoint.js index 91a3dbe..d0ed706 100644 --- a/tests/test-endpoint.js +++ b/tests/test-endpoint.js @@ -2,7 +2,6 @@ 'use strict'; var expect = require('chai').expect - , EventEmitter = require('events') , nock = require('nock') ; @@ -90,7 +89,7 @@ describe('Endpoint', function () { var test_endpoint = Object.create({}, {test: test_endpoint_descriptor}); - var scope = nock('http://localhost:8080') + nock('http://localhost:8080') .get('/test') .matchHeader('x-auth-token', 'token-aaaa') .reply(200, {}); @@ -135,7 +134,7 @@ describe('Endpoint', function () { var test_endpoint = Object.create({}, {test: test_endpoint_descriptor}); - var scope = nock('http://localhost:8080') + nock('http://localhost:8080') .get('/test') .matchHeader('st2-api-key', 'key-cccc') .reply(200, {}); diff --git a/tests/test-enumerable.js b/tests/test-enumerable.js index 8443a5a..f13c16d 100644 --- a/tests/test-enumerable.js +++ b/tests/test-enumerable.js @@ -63,7 +63,8 @@ describe('Enumerable', function () { var result = api.listAll({ a: 'b' }, {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -78,7 +79,8 @@ describe('Enumerable', function () { var result = api.listAll({ a: 'b' }, {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-paginatable.js b/tests/test-paginatable.js index d7f1adc..2f57ff2 100644 --- a/tests/test-paginatable.js +++ b/tests/test-paginatable.js @@ -151,7 +151,8 @@ describe('Paginatable', function () { var result = api.listPage(5, { a: 'b', limit: 100 }, {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -166,7 +167,8 @@ describe('Paginatable', function () { var result = api.listPage(5, { a: 'b', limit: 100 }, {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-readable.js b/tests/test-readable.js index 5307e23..41017c8 100644 --- a/tests/test-readable.js +++ b/tests/test-readable.js @@ -45,7 +45,8 @@ describe('Readable', function () { var result = api.get(1, {a: 'b'}, {token: 'token-aaaa'}); - result.then(function (response) { + result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -59,7 +60,8 @@ describe('Readable', function () { var result = api.get(1, {a: 'b'}, {key: 'key-cccc'}); - result.then(function (response) { + result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-repeatable.js b/tests/test-repeatable.js index 6666a4f..aebabcb 100644 --- a/tests/test-repeatable.js +++ b/tests/test-repeatable.js @@ -55,7 +55,8 @@ describe('Repeatable', function () { var result = api.repeat(id, request, 'test', {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -72,7 +73,8 @@ describe('Repeatable', function () { var result = api.repeat(id, request, 'test', {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-schedulable.js b/tests/test-schedulable.js index 62e078a..4b61f2e 100644 --- a/tests/test-schedulable.js +++ b/tests/test-schedulable.js @@ -53,7 +53,8 @@ describe('Schedulable', function () { var result = api.schedule({}, 'test', {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -69,7 +70,8 @@ describe('Schedulable', function () { var result = api.schedule({}, 'test', {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); diff --git a/tests/test-writable.js b/tests/test-writable.js index 3079094..1d653db 100644 --- a/tests/test-writable.js +++ b/tests/test-writable.js @@ -53,7 +53,8 @@ describe('Writable', function () { var result = api.create(request, {token: 'token-aaaa'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); @@ -69,7 +70,8 @@ describe('Writable', function () { var result = api.create(request, {key: 'key-cccc'}); - return result.then(function (response) { + return result.then(function () { + /* jshint expr: true */ expect(mock.isDone()).to.be.true; }); }); From 0e734e903760b628ca23058b5991a986c3716570 Mon Sep 17 00:00:00 2001 From: blag Date: Thu, 25 Jul 2019 16:43:43 -0700 Subject: [PATCH 4/5] Ignore package-lock.json --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e064322..3564784 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ node_modules # Custom dist +package-lock.json From 73f0f541c8d992a8af2c8426ec72a04ca86395de Mon Sep 17 00:00:00 2001 From: blag Date: Thu, 25 Jul 2019 16:44:01 -0700 Subject: [PATCH 5/5] Bump version to 1.2.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0cf608c..9f51b53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "st2client", - "version": "1.2.0", + "version": "1.2.1", "description": "StackStorm ST2 API library", "main": "index.js", "scripts": {