diff --git a/package.json b/package.json index 7b3b6817..2330c5e4 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "nyc": "^17.1.0", "prettier": "^3.3.3", "release-it": "^17.10.0", - "rsvp": "^4.7.0", "sinon": "^19.0.2", "tmp-sync": "^1.1.0" }, diff --git a/test/commands/try-each-test.js b/test/commands/try-each-test.js index 16fcf44c..69d702f6 100644 --- a/test/commands/try-each-test.js +++ b/test/commands/try-each-test.js @@ -1,7 +1,6 @@ 'use strict'; const expect = require('chai').expect; -const RSVP = require('rsvp'); const TryEachCommand = require('../../lib/commands/try-each'); const origTryEachTask = TryEachCommand._TryEachTask; @@ -16,7 +15,7 @@ describe('commands/try-each', () => { beforeEach(() => { TryEachCommand._getConfig = function () { - return RSVP.resolve(mockConfig || { scenarios: [] }); + return Promise.resolve(mockConfig || { scenarios: [] }); }; TryEachCommand._TryEachTask = MockTryEachTask; @@ -33,7 +32,7 @@ describe('commands/try-each', () => { TryEachCommand._getConfig = function (options) { configPath = options.configPath; - return RSVP.resolve({ scenarios: [{ name: 'foo' }] }); + return Promise.resolve({ scenarios: [{ name: 'foo' }] }); }; TryEachCommand.run({ configPath: 'foo/bar/widget.js' }, ['foo']); diff --git a/test/commands/try-ember-test.js b/test/commands/try-ember-test.js index e3ec9ee7..766ab102 100644 --- a/test/commands/try-ember-test.js +++ b/test/commands/try-ember-test.js @@ -1,7 +1,6 @@ 'use strict'; const expect = require('chai').expect; -const RSVP = require('rsvp'); const TryEmberCommand = require('../../lib/commands/try-ember'); const origTryEachTask = TryEmberCommand._TryEachTask; @@ -16,7 +15,7 @@ describe('commands/try-ember', () => { beforeEach(() => { TryEmberCommand._getConfig = function () { - return RSVP.resolve(mockConfig || { scenarios: [] }); + return Promise.resolve(mockConfig || { scenarios: [] }); }; TryEmberCommand._TryEachTask = MockTryEachTask; @@ -33,7 +32,7 @@ describe('commands/try-ember', () => { TryEmberCommand._getConfig = function (options) { configPath = options.configPath; - return RSVP.resolve({ scenarios: [{ name: 'foo' }] }); + return Promise.resolve({ scenarios: [{ name: 'foo' }] }); }; TryEmberCommand.run({ configPath: 'foo/bar/widget.js' }, ['foo']); @@ -45,7 +44,7 @@ describe('commands/try-ember', () => { TryEmberCommand._getConfig = function (options) { versionCompatibility = options.versionCompatibility; - return RSVP.resolve({ scenarios: [{ name: 'foo' }] }); + return Promise.resolve({ scenarios: [{ name: 'foo' }] }); }; TryEmberCommand.run({}, ['1.13.0']); diff --git a/test/commands/try-one-test.js b/test/commands/try-one-test.js index fcc19cc4..9183ed21 100644 --- a/test/commands/try-one-test.js +++ b/test/commands/try-one-test.js @@ -1,7 +1,6 @@ 'use strict'; const expect = require('chai').expect; -const RSVP = require('rsvp'); const TryOneCommand = require('../../lib/commands/try-one'); const origTryEachTask = TryOneCommand._TryEachTask; @@ -41,7 +40,7 @@ describe('commands/try-one', () => { beforeEach(() => { TryOneCommand._getConfig = function () { - return RSVP.resolve(mockConfig || { scenarios: [] }); + return Promise.resolve(mockConfig || { scenarios: [] }); }; TryOneCommand._TryEachTask = MockTryEachTask; @@ -122,7 +121,7 @@ async function testCommandSetsTheseAsCommandArgs(command, expectedArgs) { }; TryOneCommand._getConfig = async function () { - return RSVP.resolve({ scenarios: [{ name: 'default' }] }); + return Promise.resolve({ scenarios: [{ name: 'default' }] }); }; return await TryOneCommand.run({}, ['default']); diff --git a/test/dependency-manager-adapters/npm-adapter-test.js b/test/dependency-manager-adapters/npm-adapter-test.js index 0c9db7b3..b124b717 100644 --- a/test/dependency-manager-adapters/npm-adapter-test.js +++ b/test/dependency-manager-adapters/npm-adapter-test.js @@ -1,7 +1,6 @@ 'use strict'; let expect = require('chai').expect; -let RSVP = require('rsvp'); let fs = require('fs-extra'); let path = require('path'); let tmp = require('tmp-sync'); @@ -11,7 +10,6 @@ let writeJSONFile = require('../helpers/write-json-file'); let assertFileContainsJSON = require('../helpers/assert-file-contains-json'); let generateMockRun = require('../helpers/generate-mock-run'); -let remove = RSVP.denodeify(fs.remove); let root = process.cwd(); let tmproot = path.join(root, 'tmp'); let tmpdir; @@ -24,7 +22,7 @@ describe('npmAdapter', () => { afterEach(() => { process.chdir(root); - return remove(tmproot); + return fs.remove(tmproot); }); describe('#setup', () => { @@ -61,7 +59,7 @@ describe('npmAdapter', () => { callback(command, args, opts) { runCount++; expect(opts).to.have.property('cwd', tmpdir); - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -86,7 +84,7 @@ describe('npmAdapter', () => { command: 'npm install --no-optional --no-package-lock', callback() { runCount++; - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -112,7 +110,7 @@ describe('npmAdapter', () => { command: 'npm install --flat', callback() { runCount++; - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -162,7 +160,7 @@ describe('npmAdapter', () => { callback(command, args, opts) { runCount++; expect(opts).to.have.property('cwd', tmpdir); - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -188,7 +186,7 @@ describe('npmAdapter', () => { command: 'yarn install --flat --no-lockfile --ignore-engines', callback() { runCount++; - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -215,7 +213,7 @@ describe('npmAdapter', () => { command: 'yarn install --flat', callback() { runCount++; - return RSVP.resolve(); + return Promise.resolve(); }, }, ], diff --git a/test/dependency-manager-adapters/workspace-adapter-test.js b/test/dependency-manager-adapters/workspace-adapter-test.js index c5230819..91debfe1 100644 --- a/test/dependency-manager-adapters/workspace-adapter-test.js +++ b/test/dependency-manager-adapters/workspace-adapter-test.js @@ -1,7 +1,6 @@ 'use strict'; let expect = require('chai').expect; -let RSVP = require('rsvp'); let fs = require('fs-extra'); let path = require('path'); let tmp = require('tmp-sync'); @@ -11,7 +10,6 @@ let writeJSONFile = require('../helpers/write-json-file'); let assertFileContainsJSON = require('../helpers/assert-file-contains-json'); let generateMockRun = require('../helpers/generate-mock-run'); -let remove = RSVP.denodeify(fs.remove); let root = process.cwd(); let tmproot = path.join(root, 'tmp'); let tmpdir; @@ -25,7 +23,7 @@ describe('workspaceAdapter', () => { afterEach(() => { process.chdir(root); - return remove(tmproot); + return fs.remove(tmproot); }); describe('#setup', () => { @@ -141,7 +139,7 @@ describe('workspaceAdapter', () => { callback(command, args, opts) { runCount++; expect(opts).to.have.property('cwd', tmpdir); - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -167,7 +165,7 @@ describe('workspaceAdapter', () => { command: 'yarn install --flat --no-lockfile --ignore-engines', callback() { runCount++; - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -194,7 +192,7 @@ describe('workspaceAdapter', () => { command: 'yarn install --flat', callback() { runCount++; - return RSVP.resolve(); + return Promise.resolve(); }, }, ], @@ -438,7 +436,7 @@ describe('workspaceAdapter', () => { callback(command, args, opts) { runCount++; expect(opts).to.have.property('cwd', tmpdir); - return RSVP.resolve(); + return Promise.resolve(); }, }, ], diff --git a/test/tasks/reset-test.js b/test/tasks/reset-test.js index 2aa518bc..ee2918c6 100644 --- a/test/tasks/reset-test.js +++ b/test/tasks/reset-test.js @@ -2,12 +2,10 @@ const tmp = require('tmp-sync'); const path = require('path'); -const RSVP = require('rsvp'); const fs = require('fs-extra'); const fixturePackageJson = require('../fixtures/package.json'); const writeJSONFile = require('../helpers/write-json-file'); -const remove = RSVP.denodeify(fs.remove); const root = process.cwd(); const tmproot = path.join(root, 'tmp'); @@ -20,7 +18,7 @@ describe('reset', () => { afterEach(() => { process.chdir(root); - return remove(tmproot); + return fs.remove(tmproot); }); it('runs without blowing up', function () { diff --git a/test/tasks/try-each-test.js b/test/tasks/try-each-test.js index 66e8de0d..154a4d2b 100644 --- a/test/tasks/try-each-test.js +++ b/test/tasks/try-each-test.js @@ -3,7 +3,6 @@ const expect = require('chai').expect; const tmp = require('tmp-sync'); const path = require('path'); -const RSVP = require('rsvp'); const fs = require('fs-extra'); const fixturePackage = require('../fixtures/package.json'); const writeJSONFile = require('../helpers/write-json-file'); @@ -13,7 +12,6 @@ const mockery = require('mockery'); const StubDependencyAdapter = require('../helpers/stub-dependency-manager-adapter'); const generateMockRun = require('../helpers/generate-mock-run'); -const remove = RSVP.denodeify(fs.remove); const root = process.cwd(); const tmproot = path.join(root, 'tmp'); @@ -66,7 +64,7 @@ describe('tryEach', () => { mockery.deregisterAll(); mockery.disable(); process.chdir(root); - return remove(tmproot); + return fs.remove(tmproot); }); describe('with npm scenarios', () => { @@ -74,7 +72,7 @@ describe('tryEach', () => { this.timeout(300000); let mockedRun = generateMockRun('ember test', () => { - return RSVP.resolve(0); + return Promise.resolve(0); }); mockery.registerMock('./run', mockedRun); @@ -126,9 +124,9 @@ describe('tryEach', () => { let mockedRun = generateMockRun('ember test', () => { runTestCount++; if (runTestCount === 1) { - return RSVP.reject(1); + return Promise.reject(1); } else { - return RSVP.resolve(0); + return Promise.resolve(0); } }); @@ -241,7 +239,7 @@ describe('tryEach', () => { if (options.timeout && options.timeout.length === 20000 && options.timeout.isSuccess) { passedInOptions = true; } - return RSVP.resolve(0); + return Promise.resolve(0); }); mockery.registerMock('./run', mockedRun); @@ -295,7 +293,7 @@ describe('tryEach', () => { }; let mockedRun = generateMockRun('ember test', () => { - return RSVP.reject(1); + return Promise.reject(1); }); mockery.registerMock('./run', mockedRun); @@ -345,7 +343,7 @@ describe('tryEach', () => { }; let mockedRun = generateMockRun('ember test', () => { - return RSVP.reject(1); + return Promise.reject(1); }); mockery.registerMock('./run', mockedRun); @@ -396,7 +394,7 @@ describe('tryEach', () => { }; let mockedRun = generateMockRun('ember test', () => { - return RSVP.resolve(0); + return Promise.resolve(0); }); mockery.registerMock('./run', mockedRun); @@ -450,7 +448,7 @@ describe('tryEach', () => { let mockedRun = generateMockRun('ember test', () => { ranDefaultCommand = true; - return RSVP.resolve(0); + return Promise.resolve(0); }); mockery.registerMock('./run', mockedRun); @@ -498,7 +496,7 @@ describe('tryEach', () => { let ranPassedInCommand = false; let mockedRun = generateMockRun('ember serve', () => { ranPassedInCommand = true; - return RSVP.resolve(0); + return Promise.resolve(0); }); mockery.registerMock('./run', mockedRun); @@ -561,14 +559,14 @@ describe('tryEach', () => { command: 'ember test --test-port=2345', callback() { ranDefaultCommandCount++; - return RSVP.resolve(0); + return Promise.resolve(0); }, }, { command: 'npm run-script different', callback() { ranScenarioCommandCount++; - return RSVP.resolve(0); + return Promise.resolve(0); }, }, ]); @@ -673,7 +671,7 @@ describe('tryEach', () => { let actualOptions = []; let mockedRun = generateMockRun('true', (actualCommand, actualArgs, opts) => { actualOptions.push(opts); - return RSVP.resolve(0); + return Promise.resolve(0); }); mockery.registerMock('./run', mockedRun); @@ -733,7 +731,7 @@ describe('tryEach', () => { let mockRunCommand = function () { let currentScenario = process.env.EMBER_TRY_CURRENT_SCENARIO; scenarios.push(currentScenario); - return RSVP.resolve(true); + return Promise.resolve(true); }; let TryEachTask = require('../../lib/tasks/try-each'); diff --git a/test/utils/config-test.js b/test/utils/config-test.js index 28f3b082..9e5880d9 100644 --- a/test/utils/config-test.js +++ b/test/utils/config-test.js @@ -1,7 +1,6 @@ 'use strict'; const expect = require('chai').expect; -const RSVP = require('rsvp'); const fs = require('fs-extra'); const path = require('path'); const tmp = require('tmp-sync'); @@ -9,7 +8,6 @@ const fixturePackage = require('../fixtures/package.json'); const writeJSONFile = require('../helpers/write-json-file'); const getConfig = require('../../lib/utils/config'); -const remove = RSVP.denodeify(fs.remove); const root = process.cwd(); const tmproot = path.join(root, 'tmp'); @@ -25,7 +23,7 @@ describe('utils/config', () => { afterEach(() => { process.chdir(root); - return remove(tmproot); + return fs.remove(tmproot); }); function generateConfigFile(contents, filename = 'config/ember-try.js') { diff --git a/test/utils/run-command-test.js b/test/utils/run-command-test.js index 60cf45b4..c5c52eac 100644 --- a/test/utils/run-command-test.js +++ b/test/utils/run-command-test.js @@ -2,7 +2,6 @@ const expect = require('chai').expect; const mockery = require('mockery'); -const RSVP = require('rsvp'); describe('utils/run-command', () => { beforeEach(() => { @@ -24,7 +23,7 @@ describe('utils/run-command', () => { expect(args[1]).to.equal('help'); expect(args[2]).to.equal('--json'); expect(args[3]).to.equal('true'); - return RSVP.resolve(0); + return Promise.resolve(0); }; mockery.registerMock('./run', mockedRun); diff --git a/test/utils/scenario-manager-test.js b/test/utils/scenario-manager-test.js index cd3bc7a9..7814a5d0 100644 --- a/test/utils/scenario-manager-test.js +++ b/test/utils/scenario-manager-test.js @@ -2,7 +2,6 @@ const expect = require('chai').expect; const ScenarioManager = require('../../lib/utils/scenario-manager'); -const RSVP = require('rsvp'); describe('scenarioManager', () => { it('does not require any dependency managers', () => { @@ -39,13 +38,13 @@ describe('scenarioManager', () => { new (class { configKey = 'adapterA'; changeToDependencySet() { - return RSVP.resolve(['a', 'b', 'r']); + return Promise.resolve(['a', 'b', 'r']); } })(), new (class { configKey = 'adapterB'; changeToDependencySet() { - return RSVP.resolve(['u', 'q', 'a']); + return Promise.resolve(['u', 'q', 'a']); } })(), ];