From df57e23eeca6089518dd4a8fb1a0e675d0c7122d Mon Sep 17 00:00:00 2001 From: Devin Alexander Torres Date: Tue, 19 Feb 2019 23:29:04 -0600 Subject: [PATCH] feat(app): use ember-exam to run tests --- package.json | 3 ++- testem.js | 4 ++++ tests/test-helper.js | 4 ++++ yarn.lock | 17 +++++++++++++++-- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 70e8fce4..4e99ad93 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "postinstall": "patch-package", "build": "ember build", "start": "ember serve", - "test": "ember test", + "test": "ember exam", "lint:js": "eslint .", "lint:hbs": "ember-template-lint .", "cz": "git-cz", @@ -212,6 +212,7 @@ "ember-data": "^3.7.0", "ember-decorators": "^5.1.2", "ember-electron": "^2.10.0", + "ember-exam": "^2.0.3", "ember-exex": "^0.2.0", "ember-export-application-global": "^2.0.0", "ember-fetch": "^6.4.0", diff --git a/testem.js b/testem.js index 8f366821..2965fb70 100644 --- a/testem.js +++ b/testem.js @@ -1,5 +1,9 @@ /* eslint-env node */ +const jobs = process.env.JOBS || -1; +const parallel = process.env.EMBER_EXAM_SPLIT_COUNT || jobs; + module.exports = { + parallel, test_page: 'tests/index.html?hidepassed', disable_watching: true, launch_in_ci: [ diff --git a/tests/test-helper.js b/tests/test-helper.js index 5fb5682f..0b34d34b 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,8 +1,12 @@ +import loadEmberExam from 'ember-exam/test-support/load'; import { beforeEach, afterEach } from 'mocha'; import { setResolver } from 'ember-mocha'; import { enable, disable } from 'ember-concurrency-retryable'; + import resolver from './helpers/resolver'; +loadEmberExam(); + setResolver(resolver); beforeEach(() => enable()); diff --git a/yarn.lock b/yarn.lock index 7b0758ef..8d732a42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4785,7 +4785,7 @@ cli-table2@^0.2.0: optionalDependencies: colors "^1.1.2" -cli-table3@^0.5.0: +cli-table3@^0.5.0, cli-table3@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202" integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw== @@ -8224,6 +8224,19 @@ ember-electron@^2.10.0: tree-sync "^1.2.2" yarn-or-npm "^2.0.4" +ember-exam@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/ember-exam/-/ember-exam-2.0.3.tgz#74ebcdbbb5658c7420e8960bd04d1e291f728c9f" + integrity sha512-FLuDRkpUXQqjd7A3siPbPcMmUmUZlm1lumWatC/3mxph3kV+c2FIfft83CJKjkhK5i7j7jRPa49LimreC6UmbQ== + dependencies: + chalk "^2.1.0" + cli-table3 "^0.5.1" + debug "^4.1.0" + ember-cli-babel "^7.4.0" + execa "^1.0.0" + fs-extra "^7.0.1" + rimraf "^2.6.2" + ember-exex@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ember-exex/-/ember-exex-0.2.0.tgz#61b3ab45aec100688649ba114f35eb1482ed313f" @@ -14733,7 +14746,7 @@ npmlog@^2.0.3: are-we-there-yet "~1.1.2" gauge "~1.2.5" -"nprogress@github:alexlafroscia/nprogress#allow-alternate-scheduler": +nprogress@alexlafroscia/nprogress#allow-alternate-scheduler: version "0.2.0" resolved "https://codeload.github.com/alexlafroscia/nprogress/tar.gz/af37323172b98441d02aa02447f795f5766419b0"