Skip to content

Commit

Permalink
[BUGFIX release] Ensure Ember.Test globals setup when including ember…
Browse files Browse the repository at this point in the history
…-testing.js

(cherry picked from commit d4261cd)
  • Loading branch information
trentmwillis authored and rwjblue committed Apr 27, 2017
1 parent 8930b15 commit 58df3b2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -68,7 +68,8 @@
"ember-cli-sauce": "^2.0.0",
"ember-cli-yuidoc": "0.8.4",
"ember-publisher": "0.0.7",
"emberjs-build": "0.19.0",
"emberjs-build": "0.20.1",
"eslint-plugin-ember-internal": "^1.0.1",
"express": "^4.5.0",
"finalhandler": "^0.4.0",
"git-repo-info": "^1.1.4",
Expand Down
12 changes: 4 additions & 8 deletions yarn.lock
Expand Up @@ -2040,9 +2040,9 @@ ember-try@^0.2.6:
semver "^5.1.0"
sync-exec "^0.6.2"

emberjs-build@0.19.0:
version "0.19.0"
resolved "https://registry.yarnpkg.com/emberjs-build/-/emberjs-build-0.19.0.tgz#ff53601f207df1aecb23359c2ca04d463cab77dd"
emberjs-build@0.20.1:
version "0.20.1"
resolved "https://registry.yarnpkg.com/emberjs-build/-/emberjs-build-0.20.1.tgz#349db4f6049fab23d53ad3a29aafe0f5a6254395"
dependencies:
amd-name-resolver "0.0.4"
broccoli "0.16.3"
Expand Down Expand Up @@ -5303,11 +5303,7 @@ rsvp@3.0.14, rsvp@~3.0.6:
version "3.0.14"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.14.tgz#9d2968cf36d878d3bb9a9a5a4b8e1ff55a76dd31"

rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.3.3.tgz#34633caaf8bc66ceff4be3c2e1dffd032538a813"

rsvp@^3.4.0:
rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.4.0.tgz#96f397d9c7e294351b3c1456a74b3d0e7542988d"

Expand Down

0 comments on commit 58df3b2

Please sign in to comment.