Skip to content

Commit

Permalink
refactor: replace util.promisify with node promisify
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Richter committed Apr 6, 2020
1 parent ad0263e commit 84dcdd1
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 50 deletions.
2 changes: 1 addition & 1 deletion lib/cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const mkdirp = require('mkdirp');

const { Observable } = require('rx');

const promisify = require('util.promisify');
const { promisify } = require('util');

const crashRecovery = require('./crash-recovery');

Expand Down
2 changes: 1 addition & 1 deletion lib/dir-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const extend = require('lodash/extend');

const { Observable } = require('rx');

const promisify = require('util.promisify');
const { promisify } = require('util');

const { fromPromiseFunction } = require('./promise');

Expand Down
2 changes: 1 addition & 1 deletion lib/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const partial = require('lodash/partial');

const identity = require('lodash/identity');

const promisify = require('util.promisify');
const { promisify } = require('util');

const { dirChanges } = require('./dir-content');

Expand Down
31 changes: 25 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
"deep-freeze": "0.0.1",
"lodash": "^4.6.1",
"mkdirp": "^1.0.4",
"rx": "^2.3.22",
"util.promisify": "^1.0.0"
"rx": "^2.3.22"
},
"devDependencies": {
"assertive": "^2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion test/crash-recovery.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const _ = require('lodash');

const tmp = require('tmp');

const promisify = require('util.promisify');
const { promisify } = require('util');

const { timestampName } = require('../lib/cache');

Expand Down
2 changes: 1 addition & 1 deletion test/file-alternatives.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const path = require('path');

const assert = require('assertive');

const promisify = require('util.promisify');
const { promisify } = require('util');

const fileAlternativesContent = require('../lib/file-alternatives');

Expand Down
2 changes: 1 addition & 1 deletion test/file.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const assert = require('assertive');

const CSON = require('cson-parser');

const promisify = require('util.promisify');
const { promisify } = require('util');

const fileContent = require('../lib/file');

Expand Down
2 changes: 1 addition & 1 deletion test/latest-file.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const mkdirp = require('mkdirp');

const rimraf = require('rimraf');

const promisify = require('util.promisify');
const { promisify } = require('util');

const latestFile = require('../lib/latest-file');

Expand Down
69 changes: 34 additions & 35 deletions test/shared-store/with-cache.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ const { Observable } = require('rx');

const tmp = require('tmp');

const promisify = require('util.promisify');
const { promisify } = require('util');

const SharedStore = require('../../');

const tmpDir = promisify(tmp.dir, tmp);
const tmpDir = promisify(tmp.dir);

function delay(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
Expand All @@ -20,34 +20,32 @@ describe('SharedStore (with data already in cache)', () => {
let cacheTmpDir = null;

beforeEach(() =>
tmpDir({
unsafeCleanup: true,
}).then(createdDir => {
cacheTmpDir = createdDir;
const store = new SharedStore({
temp: cacheTmpDir,
loader: Observable.just({
data: 'some data',
}),
});
return store.init();
})
tmpDir({ unsafeCleanup: true })
.then(createdDir => {
cacheTmpDir = createdDir;
return new SharedStore({
temp: cacheTmpDir,
loader: Observable.just({
data: 'some data',
}),
});
})
.then(store => store.init())
);

describe('taking a long time to load data', () => {
let store;
let notSoCurrent;

beforeEach(() => {
beforeEach(async () => {
store = new SharedStore({
temp: cacheTmpDir,
loader: Observable.just({
data: 'other data',
}).delay(500),
});
return store.init().then(current => {
notSoCurrent = current;
});

notSoCurrent = await store.init();
});

beforeEach(() => delay(1000));
Expand Down Expand Up @@ -84,27 +82,28 @@ describe('SharedStore (with data already in cache)', () => {
let thrownError = false;
let store;

beforeEach(() => {
const loader = () =>
Observable.create(observer =>
delay(250).then(() => {
if (!thrownError) {
observer.onError(new Error('kaboom!'));
thrownError = true;
return;
}

observer.onNext({
data: '2nd value',
});
})
);

const loader = () =>
Observable.create(observer =>
delay(250).then(() => {
if (!thrownError) {
observer.onError(new Error('kaboom!'));
thrownError = true;
return;
}

observer.onNext({
data: '2nd value',
});
})
);

beforeEach(async () => {
store = new SharedStore({
temp: cacheTmpDir,
loader,
});
return store.init();

await store.init();
});

it('will throw an error first', done => {
Expand Down

0 comments on commit 84dcdd1

Please sign in to comment.