Merge pull request #706 from Turbo87/mocha-update

Update `ember-cli-mocha` and `ember-cli-eslint`

ember/package.json

@@ -35,11 +35,11 @@
  "ember-cli-deploy-gzip": "^1.0.0",
  "ember-cli-deploy-revision-data": "^1.0.0",
  "ember-cli-deploy-rsync-assets": "^0.2.1",
- "ember-cli-eslint": "^4.2.0",
+ "ember-cli-eslint": "^4.2.2",
  "ember-cli-htmlbars": "^2.0.3",
  "ember-cli-htmlbars-inline-precompile": "^1.0.2",
  "ember-cli-inject-live-reload": "^1.7.0",
- "ember-cli-mocha": "^0.14.4",
+ "ember-cli-mocha": "^0.14.5-beta.1",
  "ember-cli-pace": "^0.1.0",
  "ember-cli-pretender": "^1.0.1",
  "ember-cli-sass": "^7.0.0",

ember/yarn.lock

@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ember/test-helpers@^0.7.2":
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.3.tgz#49bdaeda12e1016d064f5c8857e0b31cd109e031"
+ dependencies:
+ broccoli-funnel "^2.0.1"
+ ember-cli-babel "^6.8.1"
+
 "@glimmer/compiler@^0.22.0":
  version "0.22.0"
  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.22.0.tgz#8fd2e80e1e6fc6e355819f180feb189f457184f0"
@@ -1648,6 +1655,24 @@ broccoli-funnel@^1.2.0:
  symlink-or-copy "^1.0.0"
  walk-sync "^0.3.1"
 
+broccoli-funnel@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449"
+ dependencies:
+ array-equal "^1.0.0"
+ blank-object "^1.0.1"
+ broccoli-plugin "^1.3.0"
+ debug "^2.2.0"
+ fast-ordered-set "^1.0.0"
+ fs-tree-diff "^0.5.3"
+ heimdalljs "^0.2.0"
+ minimatch "^3.0.0"
+ mkdirp "^0.5.0"
+ path-posix "^1.0.0"
+ rimraf "^2.4.3"
+ symlink-or-copy "^1.0.0"
+ walk-sync "^0.3.1"
+
 broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@~0.2.0:
  version "0.2.9"
  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
@@ -1662,13 +1687,13 @@ broccoli-kitchen-sink-helpers@^0.3.1:
  glob "^5.0.10"
  mkdirp "^0.5.1"
 
-broccoli-lint-eslint@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-4.1.0.tgz#dccfa1150dc62407cd66fd56a619273c5479a10e"
+broccoli-lint-eslint@^4.2.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-4.2.1.tgz#f780dc083a7357a9746a9cfa8f76feb092777477"
  dependencies:
  aot-test-generators "^0.1.0"
  broccoli-concat "^3.2.2"
- broccoli-persistent-filter "^1.2.0"
+ broccoli-persistent-filter "^1.4.3"
  eslint "^4.0.0"
  json-stable-stringify "^1.0.1"
  lodash.defaultsdeep "^4.6.0"
@@ -1738,6 +1763,24 @@ broccoli-persistent-filter@^1.4.0:
  symlink-or-copy "^1.0.1"
  walk-sync "^0.3.1"
 
+broccoli-persistent-filter@^1.4.3:
+ version "1.4.3"
+ resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1"
+ dependencies:
+ async-disk-cache "^1.2.1"
+ async-promise-queue "^1.0.3"
+ broccoli-plugin "^1.0.0"
+ fs-tree-diff "^0.5.2"
+ hash-for-dep "^1.0.2"
+ heimdalljs "^0.2.1"
+ heimdalljs-logger "^0.1.7"
+ mkdirp "^0.5.1"
+ promise-map-series "^0.2.1"
+ rimraf "^2.6.1"
+ rsvp "^3.0.18"
+ symlink-or-copy "^1.0.1"
+ walk-sync "^0.3.1"
+
 [email protected]:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
@@ -2283,6 +2326,12 @@ commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
  dependencies:
  graceful-readlink ">= 1.0.0"
 
+common-tags@^1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.5.1.tgz#e2e39931a013cd02253defeed89a1ad615a27f07"
+ dependencies:
+ babel-runtime "^6.26.0"
+
 commoner@~0.10.3:
  version "0.10.8"
  resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
@@ -2764,27 +2813,6 @@ ember-basic-dropdown@^0.33.1:
  ember-native-dom-helpers "^0.5.3"
  ember-wormhole "^0.5.2"
 
-ember-bootstrap@^1.0.0-rc.2:
- version "1.0.0-rc.2"
- resolved "https://registry.yarnpkg.com/ember-bootstrap/-/ember-bootstrap-1.0.0-rc.2.tgz#d7d0f88af0672c72985b0fe9f0f50540611bd83b"
- dependencies:
- broccoli-debug "^0.6.3"
- broccoli-funnel "^1.2.0"
- broccoli-merge-trees "^2.0.0"
- broccoli-stew "^1.4.0"
- chalk "^2.1.0"
- ember-assign-polyfill "^2.0.1"
- ember-cli-babel "^6.6.0"
- ember-cli-build-config-editor "^0.5.0"
- ember-cli-classlist-polyfill "^0.1.0"
- ember-cli-htmlbars "^2.0.2"
- ember-runtime-enumerable-includes-polyfill "^2.0.0"
- ember-wormhole "^0.5.2"
- findup-sync "^2.0.0"
- fs-extra "^4.0.1"
- rsvp "^4.0.1"
- silent-error "^1.0.1"
-
 ember-bootstrap@kaliber5/ember-bootstrap:
  version "1.0.0-rc.2"
  resolved "https://codeload.github.com/kaliber5/ember-bootstrap/tar.gz/552aa7b818ea7336d8fa4f4265b3239f71c0f308"
@@ -2865,7 +2893,7 @@ ember-cli-broccoli-sane-watcher@^2.0.4:
  rsvp "^3.0.18"
  sane "^1.1.1"
 
-[email protected], ember-cli-build-config-editor@^0.5.0:
+[email protected]:
  version "0.5.0"
  resolved "https://registry.yarnpkg.com/ember-cli-build-config-editor/-/ember-cli-build-config-editor-0.5.0.tgz#e19a06f4da2e3e579b407964b72df9fbf3839f4b"
  dependencies:
@@ -2969,13 +2997,13 @@ ember-cli-deploy@^1.0.1:
  rsvp "^3.3.3"
  silent-error "^1.0.0"
 
-ember-cli-eslint@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-4.2.0.tgz#3ecb7b0e67fdadd1e68eaba05fbaffb03bcd7864"
+ember-cli-eslint@^4.2.2:
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-4.2.2.tgz#4445b3365954e7a90d93d366761e088b0486ae79"
  dependencies:
- broccoli-lint-eslint "^4.1.0"
- ember-cli-version-checker "^2.0.0"
- rsvp "^3.2.1"
+ broccoli-lint-eslint "^4.2.1"
+ ember-cli-version-checker "^2.1.0"
+ rsvp "^4.6.1"
  walk-sync "^0.3.0"
 
 ember-cli-get-component-path-option@^1.0.0:
@@ -3060,17 +3088,11 @@ ember-cli-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7:
  version "1.0.12"
  resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537"
 
-ember-cli-mocha@^0.14.4:
- version "0.14.4"
- resolved "https://registry.yarnpkg.com/ember-cli-mocha/-/ember-cli-mocha-0.14.4.tgz#5f63907f952ec6d6609d551ce321dc83823ba63f"
+ember-cli-mocha@^0.14.5-beta.1:
+ version "0.14.5-beta.1"
+ resolved "https://registry.yarnpkg.com/ember-cli-mocha/-/ember-cli-mocha-0.14.5-beta.1.tgz#ea37ed65a6e9053ae9033341a65a7a0a8da3f025"
  dependencies:
- broccoli-funnel "^1.0.1"
- broccoli-merge-trees "^2.0.0"
- ember-cli-babel "^6.0.0"
- ember-cli-test-loader "^2.0.0"
- ember-mocha "^0.12.0"
- mocha "^2.5.3"
- resolve "^1.1.7"
+ ember-mocha "^0.13.0-beta.1"
 
 ember-cli-normalize-entity-name@^1.0.0:
  version "1.0.0"
@@ -3144,11 +3166,11 @@ ember-cli-test-info@^1.0.0:
  dependencies:
  ember-cli-string-utils "^1.0.0"
 
-ember-cli-test-loader@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.1.0.tgz#16163bae0ac32cad1af13c4ed94c6c698b54d431"
+ember-cli-test-loader@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243"
  dependencies:
- ember-cli-babel "^6.0.0-beta.7"
+ ember-cli-babel "^6.8.1"
 
 ember-cli-uglify@^1.2.0:
  version "1.2.0"
@@ -3181,6 +3203,13 @@ ember-cli-version-checker@^2.0.0:
  resolve "^1.3.3"
  semver "^5.3.0"
 
+ember-cli-version-checker@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.0.tgz#fc79a56032f3717cf844ada7cbdec1a06fedb604"
+ dependencies:
+ resolve "^1.3.3"
+ semver "^5.3.0"
+
 ember-cli@^2.15.0-beta.2:
  version "2.15.0-beta.2"
  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.15.0-beta.2.tgz#4d99e0346c738c86525360633a626a424b1e3f78"
@@ -3456,11 +3485,17 @@ ember-maybe-import-regenerator@^0.1.5, ember-maybe-import-regenerator@^0.1.6:
  ember-cli-babel "^6.0.0-beta.4"
  regenerator-runtime "^0.9.5"
 
-ember-mocha@^0.12.0:
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.12.0.tgz#ea27ae9838c8c6e28ea72c48084586ef5fa00a7a"
+ember-mocha@^0.13.0-beta.1:
+ version "0.13.0-beta.1"
+ resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.13.0-beta.1.tgz#f8a2ffb6ac9e6e8ed81d816d6d236cac51a59c61"
  dependencies:
- ember-test-helpers "^0.6.3"
+ "@ember/test-helpers" "^0.7.2"
+ broccoli-funnel "^2.0.1"
+ broccoli-merge-trees "^2.0.0"
+ common-tags "^1.5.1"
+ ember-cli-babel "^6.6.0"
+ ember-cli-test-loader "^2.2.0"
+ mocha "^2.5.3"
 
 ember-native-dom-helpers@^0.5.3, ember-native-dom-helpers@^0.5.4:
  version "0.5.4"
@@ -3593,10 +3628,6 @@ ember-svg-jar@^0.11.1:
  mkdirp "^0.5.1"
  path-posix "^1.0.0"
 
-ember-test-helpers@^0.6.3:
- version "0.6.3"
- resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907"
-
 ember-test-selectors@^0.3.7:
  version "0.3.7"
  resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-0.3.7.tgz#0729cee3e0a36bf0ebc1dfd561723675dfad9b8f"
@@ -6952,6 +6983,10 @@ rsvp@^4.0.1:
  version "4.6.1"
  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.6.1.tgz#fcc3bda359da00fd06fb1f2c517f2051541b05b5"
 
+rsvp@^4.6.1:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.7.0.tgz#dc1b0b1a536f7dec9d2be45e0a12ad4197c9fd96"
+
 rsvp@~3.0.6:
  version "3.0.21"
  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f"