Skip to content

Commit 1da354a

Browse files
bertdeblockbertdeblock
committed
Remove use of rsvp 
1 parent 15b5f65 commit 1da354a

11 files changed

Lines changed: 38 additions & 54 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
"nyc": "^17.1.0",
5858
"prettier": "^3.3.3",
5959
"release-it": "^17.10.0",
60-
"rsvp": "^4.7.0",
6160
"sinon": "^19.0.2",
6261
"tmp-sync": "^1.1.0"
6362
},

‎test/commands/try-each-test.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const expect = require('chai').expect;
4-
const RSVP = require('rsvp');
54
const TryEachCommand = require('../../lib/commands/try-each');
65

76
const origTryEachTask = TryEachCommand._TryEachTask;
@@ -16,7 +15,7 @@ describe('commands/try-each', () => {
1615

1716
beforeEach(() => {
1817
TryEachCommand._getConfig = function () {
19-
return RSVP.resolve(mockConfig || { scenarios: [] });
18+
return Promise.resolve(mockConfig || { scenarios: [] });
2019
};
2120

2221
TryEachCommand._TryEachTask = MockTryEachTask;
@@ -33,7 +32,7 @@ describe('commands/try-each', () => {
3332
TryEachCommand._getConfig = function (options) {
3433
configPath = options.configPath;
3534

36-
return RSVP.resolve({ scenarios: [{ name: 'foo' }] });
35+
return Promise.resolve({ scenarios: [{ name: 'foo' }] });
3736
};
3837

3938
TryEachCommand.run({ configPath: 'foo/bar/widget.js' }, ['foo']);

‎test/commands/try-ember-test.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const expect = require('chai').expect;
4-
const RSVP = require('rsvp');
54
const TryEmberCommand = require('../../lib/commands/try-ember');
65

76
const origTryEachTask = TryEmberCommand._TryEachTask;
@@ -16,7 +15,7 @@ describe('commands/try-ember', () => {
1615

1716
beforeEach(() => {
1817
TryEmberCommand._getConfig = function () {
19-
return RSVP.resolve(mockConfig || { scenarios: [] });
18+
return Promise.resolve(mockConfig || { scenarios: [] });
2019
};
2120

2221
TryEmberCommand._TryEachTask = MockTryEachTask;
@@ -33,7 +32,7 @@ describe('commands/try-ember', () => {
3332
TryEmberCommand._getConfig = function (options) {
3433
configPath = options.configPath;
3534

36-
return RSVP.resolve({ scenarios: [{ name: 'foo' }] });
35+
return Promise.resolve({ scenarios: [{ name: 'foo' }] });
3736
};
3837

3938
TryEmberCommand.run({ configPath: 'foo/bar/widget.js' }, ['foo']);
@@ -45,7 +44,7 @@ describe('commands/try-ember', () => {
4544
TryEmberCommand._getConfig = function (options) {
4645
versionCompatibility = options.versionCompatibility;
4746

48-
return RSVP.resolve({ scenarios: [{ name: 'foo' }] });
47+
return Promise.resolve({ scenarios: [{ name: 'foo' }] });
4948
};
5049

5150
TryEmberCommand.run({}, ['1.13.0']);

‎test/commands/try-one-test.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const expect = require('chai').expect;
4-
const RSVP = require('rsvp');
54
const TryOneCommand = require('../../lib/commands/try-one');
65

76
const origTryEachTask = TryOneCommand._TryEachTask;
@@ -41,7 +40,7 @@ describe('commands/try-one', () => {
4140

4241
beforeEach(() => {
4342
TryOneCommand._getConfig = function () {
44-
return RSVP.resolve(mockConfig || { scenarios: [] });
43+
return Promise.resolve(mockConfig || { scenarios: [] });
4544
};
4645

4746
TryOneCommand._TryEachTask = MockTryEachTask;
@@ -122,7 +121,7 @@ async function testCommandSetsTheseAsCommandArgs(command, expectedArgs) {
122121
};
123122

124123
TryOneCommand._getConfig = async function () {
125-
return RSVP.resolve({ scenarios: [{ name: 'default' }] });
124+
return Promise.resolve({ scenarios: [{ name: 'default' }] });
126125
};
127126

128127
return await TryOneCommand.run({}, ['default']);

‎test/dependency-manager-adapters/npm-adapter-test.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
let expect = require('chai').expect;
4-
let RSVP = require('rsvp');
54
let fs = require('fs-extra');
65
let path = require('path');
76
let tmp = require('tmp-sync');
@@ -11,7 +10,6 @@ let writeJSONFile = require('../helpers/write-json-file');
1110
let assertFileContainsJSON = require('../helpers/assert-file-contains-json');
1211
let generateMockRun = require('../helpers/generate-mock-run');
1312

14-
let remove = RSVP.denodeify(fs.remove);
1513
let root = process.cwd();
1614
let tmproot = path.join(root, 'tmp');
1715
let tmpdir;
@@ -24,7 +22,7 @@ describe('npmAdapter', () => {
2422

2523
afterEach(() => {
2624
process.chdir(root);
27-
return remove(tmproot);
25+
return fs.remove(tmproot);
2826
});
2927

3028
describe('#setup', () => {
@@ -61,7 +59,7 @@ describe('npmAdapter', () => {
6159
callback(command, args, opts) {
6260
runCount++;
6361
expect(opts).to.have.property('cwd', tmpdir);
64-
return RSVP.resolve();
62+
return Promise.resolve();
6563
},
6664
},
6765
],
@@ -86,7 +84,7 @@ describe('npmAdapter', () => {
8684
command: 'npm install --no-optional --no-package-lock',
8785
callback() {
8886
runCount++;
89-
return RSVP.resolve();
87+
return Promise.resolve();
9088
},
9189
},
9290
],
@@ -112,7 +110,7 @@ describe('npmAdapter', () => {
112110
command: 'npm install --flat',
113111
callback() {
114112
runCount++;
115-
return RSVP.resolve();
113+
return Promise.resolve();
116114
},
117115
},
118116
],
@@ -162,7 +160,7 @@ describe('npmAdapter', () => {
162160
callback(command, args, opts) {
163161
runCount++;
164162
expect(opts).to.have.property('cwd', tmpdir);
165-
return RSVP.resolve();
163+
return Promise.resolve();
166164
},
167165
},
168166
],
@@ -188,7 +186,7 @@ describe('npmAdapter', () => {
188186
command: 'yarn install --flat --no-lockfile --ignore-engines',
189187
callback() {
190188
runCount++;
191-
return RSVP.resolve();
189+
return Promise.resolve();
192190
},
193191
},
194192
],
@@ -215,7 +213,7 @@ describe('npmAdapter', () => {
215213
command: 'yarn install --flat',
216214
callback() {
217215
runCount++;
218-
return RSVP.resolve();
216+
return Promise.resolve();
219217
},
220218
},
221219
],

‎test/dependency-manager-adapters/workspace-adapter-test.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
let expect = require('chai').expect;
4-
let RSVP = require('rsvp');
54
let fs = require('fs-extra');
65
let path = require('path');
76
let tmp = require('tmp-sync');
@@ -11,7 +10,6 @@ let writeJSONFile = require('../helpers/write-json-file');
1110
let assertFileContainsJSON = require('../helpers/assert-file-contains-json');
1211
let generateMockRun = require('../helpers/generate-mock-run');
1312

14-
let remove = RSVP.denodeify(fs.remove);
1513
let root = process.cwd();
1614
let tmproot = path.join(root, 'tmp');
1715
let tmpdir;
@@ -25,7 +23,7 @@ describe('workspaceAdapter', () => {
2523

2624
afterEach(() => {
2725
process.chdir(root);
28-
return remove(tmproot);
26+
return fs.remove(tmproot);
2927
});
3028

3129
describe('#setup', () => {
@@ -141,7 +139,7 @@ describe('workspaceAdapter', () => {
141139
callback(command, args, opts) {
142140
runCount++;
143141
expect(opts).to.have.property('cwd', tmpdir);
144-
return RSVP.resolve();
142+
return Promise.resolve();
145143
},
146144
},
147145
],
@@ -167,7 +165,7 @@ describe('workspaceAdapter', () => {
167165
command: 'yarn install --flat --no-lockfile --ignore-engines',
168166
callback() {
169167
runCount++;
170-
return RSVP.resolve();
168+
return Promise.resolve();
171169
},
172170
},
173171
],
@@ -194,7 +192,7 @@ describe('workspaceAdapter', () => {
194192
command: 'yarn install --flat',
195193
callback() {
196194
runCount++;
197-
return RSVP.resolve();
195+
return Promise.resolve();
198196
},
199197
},
200198
],
@@ -438,7 +436,7 @@ describe('workspaceAdapter', () => {
438436
callback(command, args, opts) {
439437
runCount++;
440438
expect(opts).to.have.property('cwd', tmpdir);
441-
return RSVP.resolve();
439+
return Promise.resolve();
442440
},
443441
},
444442
],

‎test/tasks/reset-test.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
const tmp = require('tmp-sync');
44
const path = require('path');
5-
const RSVP = require('rsvp');
65
const fs = require('fs-extra');
76
const fixturePackageJson = require('../fixtures/package.json');
87
const writeJSONFile = require('../helpers/write-json-file');
98

10-
const remove = RSVP.denodeify(fs.remove);
119
const root = process.cwd();
1210
const tmproot = path.join(root, 'tmp');
1311

@@ -20,7 +18,7 @@ describe('reset', () => {
2018

2119
afterEach(() => {
2220
process.chdir(root);
23-
return remove(tmproot);
21+
return fs.remove(tmproot);
2422
});
2523

2624
it('runs without blowing up', function () {

‎test/tasks/try-each-test.js‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const expect = require('chai').expect;
44
const tmp = require('tmp-sync');
55
const path = require('path');
6-
const RSVP = require('rsvp');
76
const fs = require('fs-extra');
87
const fixturePackage = require('../fixtures/package.json');
98
const writeJSONFile = require('../helpers/write-json-file');
@@ -13,7 +12,6 @@ const mockery = require('mockery');
1312
const StubDependencyAdapter = require('../helpers/stub-dependency-manager-adapter');
1413
const generateMockRun = require('../helpers/generate-mock-run');
1514

16-
const remove = RSVP.denodeify(fs.remove);
1715
const root = process.cwd();
1816
const tmproot = path.join(root, 'tmp');
1917

@@ -66,15 +64,15 @@ describe('tryEach', () => {
6664
mockery.deregisterAll();
6765
mockery.disable();
6866
process.chdir(root);
69-
return remove(tmproot);
67+
return fs.remove(tmproot);
7068
});
7169

7270
describe('with npm scenarios', () => {
7371
it("succeeds when scenario's tests succeed", function () {
7472
this.timeout(300000);
7573

7674
let mockedRun = generateMockRun('ember test', () => {
77-
return RSVP.resolve(0);
75+
return Promise.resolve(0);
7876
});
7977

8078
mockery.registerMock('./run', mockedRun);
@@ -126,9 +124,9 @@ describe('tryEach', () => {
126124
let mockedRun = generateMockRun('ember test', () => {
127125
runTestCount++;
128126
if (runTestCount === 1) {
129-
return RSVP.reject(1);
127+
return Promise.reject(1);
130128
} else {
131-
return RSVP.resolve(0);
129+
return Promise.resolve(0);
132130
}
133131
});
134132

@@ -241,7 +239,7 @@ describe('tryEach', () => {
241239
if (options.timeout && options.timeout.length === 20000 && options.timeout.isSuccess) {
242240
passedInOptions = true;
243241
}
244-
return RSVP.resolve(0);
242+
return Promise.resolve(0);
245243
});
246244

247245
mockery.registerMock('./run', mockedRun);
@@ -295,7 +293,7 @@ describe('tryEach', () => {
295293
};
296294

297295
let mockedRun = generateMockRun('ember test', () => {
298-
return RSVP.reject(1);
296+
return Promise.reject(1);
299297
});
300298
mockery.registerMock('./run', mockedRun);
301299

@@ -345,7 +343,7 @@ describe('tryEach', () => {
345343
};
346344

347345
let mockedRun = generateMockRun('ember test', () => {
348-
return RSVP.reject(1);
346+
return Promise.reject(1);
349347
});
350348
mockery.registerMock('./run', mockedRun);
351349

@@ -396,7 +394,7 @@ describe('tryEach', () => {
396394
};
397395

398396
let mockedRun = generateMockRun('ember test', () => {
399-
return RSVP.resolve(0);
397+
return Promise.resolve(0);
400398
});
401399
mockery.registerMock('./run', mockedRun);
402400

@@ -450,7 +448,7 @@ describe('tryEach', () => {
450448

451449
let mockedRun = generateMockRun('ember test', () => {
452450
ranDefaultCommand = true;
453-
return RSVP.resolve(0);
451+
return Promise.resolve(0);
454452
});
455453

456454
mockery.registerMock('./run', mockedRun);
@@ -498,7 +496,7 @@ describe('tryEach', () => {
498496
let ranPassedInCommand = false;
499497
let mockedRun = generateMockRun('ember serve', () => {
500498
ranPassedInCommand = true;
501-
return RSVP.resolve(0);
499+
return Promise.resolve(0);
502500
});
503501
mockery.registerMock('./run', mockedRun);
504502

@@ -561,14 +559,14 @@ describe('tryEach', () => {
561559
command: 'ember test --test-port=2345',
562560
callback() {
563561
ranDefaultCommandCount++;
564-
return RSVP.resolve(0);
562+
return Promise.resolve(0);
565563
},
566564
},
567565
{
568566
command: 'npm run-script different',
569567
callback() {
570568
ranScenarioCommandCount++;
571-
return RSVP.resolve(0);
569+
return Promise.resolve(0);
572570
},
573571
},
574572
]);
@@ -673,7 +671,7 @@ describe('tryEach', () => {
673671
let actualOptions = [];
674672
let mockedRun = generateMockRun('true', (actualCommand, actualArgs, opts) => {
675673
actualOptions.push(opts);
676-
return RSVP.resolve(0);
674+
return Promise.resolve(0);
677675
});
678676
mockery.registerMock('./run', mockedRun);
679677

@@ -733,7 +731,7 @@ describe('tryEach', () => {
733731
let mockRunCommand = function () {
734732
let currentScenario = process.env.EMBER_TRY_CURRENT_SCENARIO;
735733
scenarios.push(currentScenario);
736-
return RSVP.resolve(true);
734+
return Promise.resolve(true);
737735
};
738736

739737
let TryEachTask = require('../../lib/tasks/try-each');

0 commit comments

Comments
 (0)