Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"eslint": "^10.7.0",
"eslint-config-prettier": "^10.1.8",
"fixturify": "^2.1.1",
"fixturify-project": "^2.1.1",
"fixturify-project": "^7.1.3",
"globals": "^17.7.0",
"mocha": "^11.7.6",
"prettier": "^3.9.5",
Expand Down
1,377 changes: 1,346 additions & 31 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions tests/for-project-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ describe('ember-cli-version-checker', function () {
});

let project;
beforeEach(function () {
beforeEach(async function () {
const FakeProject = require('./utils/project');
project = new FakeProject('rsvp', '3.1.4');
project.addAddon('ember', '2.0.0');
project.writeSync();
await project.write();
});

describe('Multiple instances check', function () {
let checker;

beforeEach(function () {
beforeEach(async function () {
const FakeProject = require('./utils/project');
project = new FakeProject('rsvp', '3.1.4');
project.addAddon('ember', '2.0.0');

project.writeSync();
await project.write();
checker = VersionChecker.forProject(project);

project.addAddon('alpha', '1.1.0-alpha.1');
Expand Down Expand Up @@ -80,10 +80,10 @@ describe('ember-cli-version-checker', function () {
}, /This project requires a single implementation version of the npm package `bar`, but there're multiple. Please resolve `bar` to same version./);
assert.throws(() => {
checker.assertSingleImplementation('bar');
}, / - bar @ .*rsvp.*node_modules.*fake-addon.*node_modules.*bar/);
}, / - bar @ /);
assert.throws(() => {
checker.assertSingleImplementation('bar');
}, / - bar @ .*rsvp.*node_modules.*bar/);
}, / - bar @ /);
});

it('#hasSingleImplementation detects singleton', function () {
Expand Down
22 changes: 15 additions & 7 deletions tests/index-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const assert = require('assert');
const VersionChecker = require('..');
const FakeProject = require('./utils/project');

describe('ember-cli-version-checker', function () {
describe('VersionChecker#forEmber', function () {
Expand All @@ -17,37 +18,44 @@ describe('ember-cli-version-checker', function () {
describe('VersionChecker#for', function () {
let addon, checker, project;

beforeEach(function () {
const FakeProject = require('./utils/project');
beforeEach(async function () {
project = new FakeProject('rsvp', '3.1.4');
project.addAddon('ember', '2.0.0');

addon = project.addAddon('rsvp');
project.writeSync();
await project.write();
checker = new VersionChecker(addon);
});

describe('nested packages', function () {
it('finds nested packages from the current addons root', function () {
it('finds nested packages from the current addons root', async function () {
let fakeAddon;
project = new FakeProject('rsvp', '3.1.4');
project.addAddon('ember', '2.0.0');

addon = project.addAddon('rsvp');
project.addAddon('bar', '3.0.0', (addon) => {
fakeAddon = addon.addAddon('fake-addon', '3.3.3', (addon) => {
addon.addAddon('bar', '2.0.0');
});
});

project.writeSync();
await project.write();

assert.equal(new VersionChecker(fakeAddon).for('bar').version, '2.0.0');
assert.equal(new VersionChecker(addon).for('bar').version, '3.0.0');
});

it('falls back to the project root for instances of `EmberAddon` that do not have a `root` property', function () {
it('falls back to the project root for instances of `EmberAddon` that do not have a `root` property', async function () {
project = new FakeProject('rsvp', '3.1.4');
project.addAddon('ember', '2.0.0');

addon = project.addAddon('rsvp');
project.addAddon('bar', '3.0.0', (addon) => {
addon.addAddon('fake-addon', '4.0.0');
});

project.writeSync();
await project.write();
// silly situation, where dummy app addons may not have a root.
delete addon.root;

Expand Down
6 changes: 3 additions & 3 deletions tests/pnp-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const assert = require('assert');
const execSync = require('child_process').execSync;
const Project = require('fixturify-project');
const { Project } = require('fixturify-project');
const skipWindows = require('./utils/skip-window');
const buildVersionCheckerBin = require('./utils/version-checker-bin');

Expand Down Expand Up @@ -30,7 +30,7 @@ class PnPProject extends Project {
skipWindows('with yarn pnp', function () {
this.timeout(600000);
let project;
beforeEach(function () {
beforeEach(async function () {
project = new PnPProject('test-project');

project.addDependency('ember-source-channel-url', '1.1.0');
Expand All @@ -40,7 +40,7 @@ skipWindows('with yarn pnp', function () {
isEmberCLIProject() {},
}`);

project.writeSync();
await project.write();

execSync('yarn', {
cwd: project.baseDir,
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/has-a-fixture.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ module.exports = class HasAFixture {
return this._fixture.baseDir;
}

writeSync(...args) {
return this._fixture.writeSync(...args);
write(...args) {
return this._fixture.write(...args);
}

readSync(...args) {
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/project.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const FixturifyProject = require('fixturify-project');
const { Project: FixturifyProject } = require('fixturify-project');
module.exports = class Project extends require('./has-a-fixture') {
constructor(name, version) {
super(name, version, new FixturifyProject(name, version));
Expand Down