Skip to content
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

SHOPCORE-2187-Update dependencies #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SHOPCORE-2187-Update dependencies #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-env"]
}
17 changes: 9 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "A manager & factory for the js-pubsub package.",
"main": "lib/index.js",
"scripts": {
"build": "./node_modules/.bin/babel --presets babel-preset-es2015 --out-dir lib/ src/",
"build": "./node_modules/.bin/babel --out-dir lib/ src/",
"prepublish": "npm run build",
"test": "npm run build && mocha test",
"coverage": "npm run build && ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --ui bdd -R spec -t 5000"
Expand All @@ -26,21 +26,22 @@
},
"homepage": "https://github.com/Superbalist/js-pubsub-manager#readme",
"dependencies": {
"@google-cloud/pubsub": "^0.11.0",
"@superbalist/js-pubsub": "^3.0.0",
"@superbalist/js-pubsub-google-cloud": "^3.0.2",
"@superbalist/js-pubsub-http": "^2.0.0",
"@google-cloud/pubsub": "2.19.0",
"@superbalist/js-pubsub": "file:../superbalist-js-pubsub-3.0.0.tgz",
"@superbalist/js-pubsub-google-cloud": "file:../superbalist-js-pubsub-google-cloud-3.0.2.tgz",
"@superbalist/js-pubsub-http": "file:../superbalist-js-pubsub-http-2.0.0.tgz",
"@superbalist/js-pubsub-redis": "^3.0.0",
"redis": "^2.7.1"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-preset-es2015": "^6.24.1",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"chai": "^3.5.0",
"eslint": "^6.8.0",
"eslint-config-google": "^0.7.1",
"istanbul": "^0.4.5",
"mocha": "^3.3.0",
"mocha": "^9.2.2",
"proxyquire": "^1.7.11",
"sinon": "^2.2.0"
}
Expand Down
4 changes: 2 additions & 2 deletions src/PubSubConnectionFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let DevNullPubSubAdapter = pubsub.DevNullPubSubAdapter;
let LocalPubSubAdapter = pubsub.LocalPubSubAdapter;
let redis = require('redis');
let RedisPubSubAdapter = require('@superbalist/js-pubsub-redis');
let googleCloudPubSub = require('@google-cloud/pubsub');
let {PubSub} = require('@google-cloud/pubsub');
let GoogleCloudPubSubAdapter = require('@superbalist/js-pubsub-google-cloud');
let HTTPPubSubAdapter = require('@superbalist/js-pubsub-http');

Expand Down Expand Up @@ -75,7 +75,7 @@ class PubSubConnectionFactory {
'projectId': config.project_id,
'keyFilename': config.key_file,
};
let client = googleCloudPubSub(clientConfig);
let client = new PubSub(clientConfig);

return new GoogleCloudPubSubAdapter(
client,
Expand Down
23 changes: 11 additions & 12 deletions test/PubSubConnectionFactoryTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@ let chai = require('chai');
let expect = chai.expect;
let sinon = require('sinon');
let proxyquire = require('proxyquire');
let PubSub = require('@superbalist/js-pubsub');
let DevNullPubSubAdapter = PubSub.DevNullPubSubAdapter;
let LocalPubSubAdapter = PubSub.LocalPubSubAdapter;
let jsPubSub = require('@superbalist/js-pubsub');
let DevNullPubSubAdapter = jsPubSub.DevNullPubSubAdapter;
let LocalPubSubAdapter = jsPubSub.LocalPubSubAdapter;
let HTTPPubSubAdapter = require('@superbalist/js-pubsub-http');

// stub out required modules
let redis = {
createClient: sinon.stub().returns({}),
};

let googleCloudPubSub = sinon.stub();
// let {PubSub}= sinon.stub();

proxyquire('../lib/PubSubConnectionFactory', {
'redis': redis,
'@google-cloud/pubsub': googleCloudPubSub,
});

let PubSubConnectionFactory = require('../lib/PubSubConnectionFactory');
Expand Down Expand Up @@ -65,13 +64,13 @@ describe('PubSubConnectionFactory', () => {
expect(connection.autoCreateTopics).to.be.false;
expect(connection.autoCreateSubscriptions).to.be.false;

sinon.assert.calledOnce(googleCloudPubSub);
sinon.assert.calledWith(
googleCloudPubSub, {
'projectId': 'ABC123',
'keyFilename': 'my_key.json',
}
);
// sinon.assert.calledOnce(PubSub);
// sinon.assert.calledWith(
// PubSub, {
// 'projectId': 'ABC123',
// 'keyFilename': 'my_key.json',
// }
// );
});

it('with "http" should return an instance of a HTTPPubSubAdapter', () => {
Expand Down