Skip to content

Commit

Permalink
Merge pull request #296 from emberjs/update-@ember/test-helpers
Browse files Browse the repository at this point in the history
Update to @ember/test-helpers (from ember-test-helpers).
  • Loading branch information
rwjblue committed Nov 11, 2017
2 parents c1fa4d7 + 24e4a36 commit a9956f1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions addon-test-support/ember-qunit/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export {
settled,
pauseTest,
resumeTest,
} from 'ember-test-helpers';
} from '@ember/test-helpers';
export { module, test, skip, only, todo } from 'qunit';
export { loadTests } from './test-loader';

Expand All @@ -22,7 +22,7 @@ import {
teardownContext,
setupRenderingContext,
teardownRenderingContext,
} from 'ember-test-helpers';
} from '@ember/test-helpers';

export function setupTest(hooks, options) {
hooks.beforeEach(function(assert) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"common-tags": "^1.4.0",
"ember-cli-babel": "^6.3.0",
"ember-cli-test-loader": "^2.2.0",
"ember-test-helpers": "^0.7.0-beta.11",
"@ember/test-helpers": "^0.7.0",
"qunit": "^2.4.1"
},
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
# yarn lockfile v1


"@ember/test-helpers@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.0.tgz#4ba5a98eb0aab81dbe8b3318f421a919aa0b8548"
dependencies:
broccoli-funnel "^2.0.1"
ember-cli-babel "^6.8.1"

"@glimmer/compiler@^0.25.3":
version "0.25.3"
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.25.3.tgz#25eb06394f3ba1c1fae5af25c9cf7deb2c11ef4e"
Expand Down Expand Up @@ -2133,13 +2140,6 @@ ember-source@~2.15.0:
simple-dom "^0.3.0"
simple-html-tokenizer "^0.4.1"

ember-test-helpers@^0.7.0-beta.11:
version "0.7.0-beta.11"
resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.7.0-beta.11.tgz#a712a2faa665653c694e649d6aceacecc89ea2e8"
dependencies:
broccoli-funnel "^2.0.1"
ember-cli-babel "^6.8.1"

ember-try-config@^2.0.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-2.1.0.tgz#e0e156229a542346a58ee6f6ad605104c98edfe0"
Expand Down

0 comments on commit a9956f1

Please sign in to comment.