Skip to content

Commit

Permalink
Merge pull request #26 from Turbo87/mocha-0.14
Browse files Browse the repository at this point in the history 
Update `ember-cli-mocha` to v0.14.5
  • Loading branch information
@Turbo87
Turbo87 authored Feb 5, 2018
2 parents d216a43 + 020978c commit 40ca37c
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 47 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-mocha": "0.13.1",
"ember-cli-mocha": "^0.14.0",
"ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
Expand Down
112 changes: 66 additions & 46 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,7 @@ broccoli-asset-rewrite@^1.1.0:
dependencies:
broccoli-filter "^1.2.3"

broccoli-babel-transpiler@^5.4.5, broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2:
broccoli-babel-transpiler@^5.4.5, broccoli-babel-transpiler@^5.6.2:
version "5.7.2"
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.2.tgz#756c30544775144e984333b7115f42c916ba08e0"
dependencies:
Expand Down Expand Up @@ -1201,7 +1201,7 @@ broccoli-builder@^0.18.0:
rsvp "^3.0.17"
silent-error "^1.0.1"

broccoli-caching-writer@^2.2.0, broccoli-caching-writer@^2.3.1:
broccoli-caching-writer@^2.2.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
dependencies:
Expand Down Expand Up @@ -1232,19 +1232,6 @@ broccoli-clean-css@^1.1.0:
inline-source-map-comment "^1.0.5"
json-stable-stringify "^1.0.0"

broccoli-concat@^2.1.0:
version "2.3.8"
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-2.3.8.tgz#590cdcc021bb905b6c121d87c2d1d57df44a2a48"
dependencies:
broccoli-caching-writer "^2.3.1"
broccoli-kitchen-sink-helpers "^0.3.1"
broccoli-stew "^1.3.3"
fast-sourcemap-concat "^1.0.1"
fs-extra "^0.30.0"
lodash.merge "^4.3.0"
lodash.omit "^4.1.0"
lodash.uniq "^4.2.0"

broccoli-concat@^3.0.4, broccoli-concat@^3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.2.2.tgz#86ffdc52606eb590ba9f6b894c5ec7a016f5b7b9"
Expand Down Expand Up @@ -1326,6 +1313,24 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.6, broccoli
symlink-or-copy "^1.0.0"
walk-sync "^0.3.1"

broccoli-funnel@^2.0.0:
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:
version "0.2.9"
resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
Expand All @@ -1352,7 +1357,7 @@ broccoli-lint-eslint@^3.3.0:
lodash.defaultsdeep "^4.6.0"
md5-hex "^2.0.0"

broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.4, broccoli-merge-trees@^1.1.5:
broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.4, broccoli-merge-trees@^1.1.5:
version "1.2.4"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
dependencies:
Expand All @@ -1365,6 +1370,13 @@ broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^
rimraf "^2.4.3"
symlink-or-copy "^1.0.0"

broccoli-merge-trees@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz#10aea46dd5cebcc8b8f7d5a54f0a84a4f0bb90b9"
dependencies:
broccoli-plugin "^1.3.0"
merge-trees "^1.0.1"

broccoli-middleware@^0.18.1:
version "0.18.1"
resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-0.18.1.tgz#bf525581c2deb652c425942b18580f76d3748122"
Expand Down Expand Up @@ -2169,7 +2181,7 @@ ember-ajax@^2.4.1:
dependencies:
ember-cli-babel "^5.1.5"

ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1:
ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
version "5.2.4"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13"
dependencies:
Expand All @@ -2179,13 +2191,13 @@ ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-c
ember-cli-version-checker "^1.0.2"
resolve "^1.1.2"

ember-cli-babel@^6.0.0-beta.7:
version "6.8.2"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.2.tgz#eac2785964f4743f4c815cd53c6288f00cc087d7"
ember-cli-babel@^6.0.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.8.1:
version "6.11.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.11.0.tgz#79cb184bac3c05bfe181ddc306bac100ab1f9493"
dependencies:
amd-name-resolver "0.0.7"
babel-plugin-debug-macros "^0.1.11"
babel-plugin-ember-modules-api-polyfill "^2.0.1"
babel-plugin-ember-modules-api-polyfill "^2.3.0"
babel-plugin-transform-es2015-modules-amd "^6.24.0"
babel-polyfill "^6.16.0"
babel-preset-env "^1.5.1"
Expand All @@ -2194,15 +2206,16 @@ ember-cli-babel@^6.0.0-beta.7:
broccoli-funnel "^1.0.0"
broccoli-source "^1.1.0"
clone "^2.0.0"
ember-cli-version-checker "^2.0.0"
ember-cli-version-checker "^2.1.0"
semver "^5.4.1"

ember-cli-babel@^6.11.0:
version "6.11.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.11.0.tgz#79cb184bac3c05bfe181ddc306bac100ab1f9493"
ember-cli-babel@^6.0.0-beta.7:
version "6.8.2"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.2.tgz#eac2785964f4743f4c815cd53c6288f00cc087d7"
dependencies:
amd-name-resolver "0.0.7"
babel-plugin-debug-macros "^0.1.11"
babel-plugin-ember-modules-api-polyfill "^2.3.0"
babel-plugin-ember-modules-api-polyfill "^2.0.1"
babel-plugin-transform-es2015-modules-amd "^6.24.0"
babel-polyfill "^6.16.0"
babel-preset-env "^1.5.1"
Expand All @@ -2211,8 +2224,7 @@ ember-cli-babel@^6.11.0:
broccoli-funnel "^1.0.0"
broccoli-source "^1.1.0"
clone "^2.0.0"
ember-cli-version-checker "^2.1.0"
semver "^5.4.1"
ember-cli-version-checker "^2.0.0"

ember-cli-broccoli-sane-watcher@^2.0.3:
version "2.0.4"
Expand Down Expand Up @@ -2317,18 +2329,15 @@ 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.13.1:
version "0.13.1"
resolved "https://registry.yarnpkg.com/ember-cli-mocha/-/ember-cli-mocha-0.13.1.tgz#c6df304f52a9aaa1be1ba92b220f16b9d097f2f2"
ember-cli-mocha@^0.14.0:
version "0.14.5"
resolved "https://registry.yarnpkg.com/ember-cli-mocha/-/ember-cli-mocha-0.14.5.tgz#c37f76b28b8262b87ed3b75c0d20dca609fff1a6"
dependencies:
broccoli-babel-transpiler "^5.5.0"
broccoli-concat "^2.1.0"
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.1.1"
ember-cli-babel "^5.1.7"
ember-cli-test-loader "^1.1.0"
ember-cli-version-checker "^1.1.6"
ember-mocha "^0.11.0"
broccoli-funnel "^2.0.0"
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"

Expand Down Expand Up @@ -2379,11 +2388,11 @@ ember-cli-test-info@^1.0.0:
dependencies:
ember-cli-string-utils "^1.0.0"

ember-cli-test-loader@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-1.1.1.tgz#333311209b18185d0e0e95f918349da10cacf0b1"
ember-cli-test-loader@^2.0.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 "^5.2.1"
ember-cli-babel "^6.8.1"

ember-cli-uglify@^1.2.0:
version "1.2.0"
Expand Down Expand Up @@ -2517,9 +2526,9 @@ ember-load-initializers@^0.6.0:
dependencies:
ember-cli-babel "^5.1.6"

ember-mocha@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.11.1.tgz#c17899dff5a79556403e255bcfa4eadab0cac2de"
ember-mocha@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.12.0.tgz#ea27ae9838c8c6e28ea72c48084586ef5fa00a7a"
dependencies:
ember-test-helpers "^0.6.3"

Expand Down Expand Up @@ -5020,6 +5029,17 @@ [email protected]:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"

merge-trees@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
dependencies:
can-symlink "^1.0.0"
fs-tree-diff "^0.5.4"
heimdalljs "^0.2.1"
heimdalljs-logger "^0.1.7"
rimraf "^2.4.3"
symlink-or-copy "^1.0.0"

merge@^1.1.3:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
Expand Down

0 comments on commit 40ca37c

Please sign in to comment.