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

Remove multidep setup #763

Merged
merged 1 commit into from
Jul 5, 2021
Merged

Remove multidep setup #763

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
11 changes: 0 additions & 11 deletions node-tests/fixtures/default/expected6.js
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions node-tests/multidep.json
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions node-tests/strip-data-test-properties-plugin-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,12 @@
let fs = require('fs');
let assert = require('assert');
let multidepRequire = require('multidep')('node-tests/multidep.json');

let babel6 = multidepRequire('babel-core', '6.24.0');
let babel7 = require('@babel/core');

let StripDataTestPropertiesPlugin6 = require('../strip-data-test-properties-plugin6');

function testFixture(name) {
it(`Babel6: fixture: ${name}`, function() {
let fixturePath = `${__dirname}/fixtures/${name}/fixture.js`;
let expectedPath = `${__dirname}/fixtures/${name}/expected6.js`;

let expected = fs.readFileSync(expectedPath, 'utf8').replace(/\r\n/g, '\n');

let result = babel6.transformFileSync(fixturePath, {
plugins: [StripDataTestPropertiesPlugin6],
});

assert.strictEqual(result.code.trim(), expected.trim());
});

it(`Babel7: fixture: ${name}`, function() {
it(`fixture: ${name}`, function() {
let fixturePath = `${__dirname}/fixtures/${name}/fixture.js`;
let expectedPath = `${__dirname}/fixtures/${name}/expected7.js`;

Expand Down
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"test": "npm run test:keep && npm run test:strip",
"test:all": "ember try:each",
"test:keep": "ember test",
"pretest:node": "multidep node-tests/multidep.json",
"test:node": "mocha node-tests",
"test:strip": "STRIP_TEST_SELECTORS=true ember test"
},
Expand Down Expand Up @@ -53,7 +52,6 @@
"lerna-changelog": "1.0.1",
"loader.js": "4.7.0",
"mocha": "8.4.0",
"multidep": "2.0.2",
"qunit": "2.16.0",
"qunit-dom": "1.6.0",
"release-it": "14.10.0",
Expand Down
16 changes: 1 addition & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8766,15 +8766,6 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

multidep@2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/multidep/-/multidep-2.0.2.tgz#ffa2b97791bc4c879267dc3f7324c207b2decc67"
integrity sha1-/6K5d5G8TIeSZ9w/cyTCB7LezGc=
dependencies:
rimraf "^2.4.3"
rsvp "^3.1.0"
spawn-cmd "0.0.2"

mustache@^3.0.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
Expand Down Expand Up @@ -10336,7 +10327,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"

rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.1.0:
rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21:
version "3.6.2"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
Expand Down Expand Up @@ -10834,11 +10825,6 @@ spawn-args@^0.2.0:
resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=

spawn-cmd@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/spawn-cmd/-/spawn-cmd-0.0.2.tgz#6d5e251fad0eab00b0f193d245669a7a228ec0de"
integrity sha1-bV4lH60OqwCw8ZPSRWaaeiKOwN4=

split-on-first@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
Expand Down