From e2e7265bf55109fa6f23f78ef4567a44101bc316 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Thu, 14 May 2020 11:29:46 -0400 Subject: [PATCH] Remove bin/run-qunit.js test script. Use `qunit dist/**/*-node-test.js` instead of custom script. --- .travis.yml | 4 +--- bin/run-qunit.js | 32 -------------------------------- package.json | 3 +-- yarn.lock | 5 ----- 4 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 bin/run-qunit.js diff --git a/.travis.yml b/.travis.yml index ba3588f991..01a96b47a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,8 @@ jobs: - name: Tests (Node.js) - env: - - NODE_PATH=dist - script: + - yarn ember build - yarn test:node - name: Tests (Browser) diff --git a/bin/run-qunit.js b/bin/run-qunit.js deleted file mode 100644 index 88b50d886f..0000000000 --- a/bin/run-qunit.js +++ /dev/null @@ -1,32 +0,0 @@ -const requireQUnit = require('qunit/src/cli/require-qunit'); -const FindReporter = require('qunit/src/cli/find-reporter'); -const path = require('path'); -const glob = require('glob'); -const execa = require('execa'); -const qunitRun = require('qunit/src/cli/run'); - -const EMBER_BIN = 'ember'; -exec(EMBER_BIN, ['build']); - -require('./yarn-link-local'); - -global.QUnit = requireQUnit(); - -let cwd = path.resolve(__dirname, '..'); - -let tests = glob.sync('dist/@glimmer/**/*-node-test.js', { cwd }); - -let result = qunitRun(tests, { - requires: [], - reporter: FindReporter.findReporter('tap'), -}); - -console.log(result); - -// Executes a command and pipes stdout back to the user. -function exec(command, args) { - execa.sync(command, args, { - stdio: 'inherit', - preferLocal: true, - }); -} diff --git a/package.json b/package.json index 7a4b55363e..ee3a15d06f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "start": "ember serve --port=7357", "test": "ember test", "test:browserstack": "ember test --test-port=7774 --host 127.0.0.1 --config-file=testem-browserstack.js", - "test:node": "node bin/run-qunit.js", + "test:node": "qunit dist/**/*-node-test.js", "test:smoke": "SMOKE_TESTS=true ember test", "test:types": "node bin/run-types-tests.js", "yarn:link": "node bin/yarn-link-all", @@ -83,7 +83,6 @@ "mkdirp": "^0.5.1", "prettier": "^1.19.1", "qunit": "^2.9.3", - "qunit-tap": "^1.5.1", "release-it": "^13.5.8", "release-it-lerna-changelog": "^2.3.0", "release-it-yarn-workspaces": "^1.4.0", diff --git a/yarn.lock b/yarn.lock index ce5075e063..1e06998992 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6829,11 +6829,6 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8: rimraf "^2.5.4" underscore.string "~3.3.4" -qunit-tap@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/qunit-tap/-/qunit-tap-1.5.1.tgz#29f9519c56fa9def32f9681711515c41ed231e91" - integrity sha1-KflRnFb6ne8y+WgXEVFcQe0jHpE= - qunit@^2.9.3: version "2.9.3" resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.9.3.tgz#9522a088e76f0782f70a45db92f2fd14db311bcc"