From 72f1638b8f9544f27dd7b5dd90f08176e83efc88 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 3 Aug 2017 00:40:10 +0200 Subject: [PATCH] Update "ember-cli-qunit" to v4.0.1 --- bower.json | 4 +--- package.json | 6 +++--- tests/test-helper.js | 7 ++++--- yarn.lock | 41 ++++++++++++++++++++--------------------- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/bower.json b/bower.json index 7b3b011a..c8a874f5 100644 --- a/bower.json +++ b/bower.json @@ -2,8 +2,6 @@ "name": "ember-router-scroll", "dependencies": { "ember": "~2.6.0", - "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", - "ember-qunit-notifications": "0.1.0" + "ember-cli-shims": "0.1.1" } } diff --git a/package.json b/package.json index 43786a7c..10684b6c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "ember-cli-htmlbars-inline-precompile": "^0.4.4", "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-jshint": "^2.0.1", - "ember-cli-qunit": "^3.1.2", + "ember-cli-qunit": "^4.0.0", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", "ember-disable-prototype-extensions": "^1.1.0", @@ -83,9 +83,9 @@ "browser scroll" ], "dependencies": { + "ember-app-scheduler": "0.0.5", "ember-cli-babel": "^6.6.0", - "ember-getowner-polyfill": "^1.2.3", - "ember-app-scheduler": "0.0.5" + "ember-getowner-polyfill": "^1.2.3" }, "ember-addon": { "configPath": "tests/dummy/config", diff --git a/tests/test-helper.js b/tests/test-helper.js index e6cfb70f..6a69e4a6 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,6 +1,7 @@ +import { setResolver } from 'ember-qunit'; +import { start } from 'ember-cli-qunit'; + import resolver from './helpers/resolver'; -import { - setResolver -} from 'ember-qunit'; setResolver(resolver); +start(); diff --git a/yarn.lock b/yarn.lock index 5696fcdd..5ab3caa4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1025,7 +1025,7 @@ broccoli-asset-rewrite@^1.1.0: dependencies: broccoli-filter "^1.2.3" -broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2: +broccoli-babel-transpiler@^5.6.2: version "5.6.2" resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.6.2.tgz#958c72e43575b2f0a862a5096dba1ce1ebc7d74d" dependencies: @@ -1200,7 +1200,7 @@ broccoli-kitchen-sink-helpers@^0.3.1: glob "^5.0.10" mkdirp "^0.5.1" -broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.3: +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.3: version "1.2.1" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.1.tgz#16a7494ed56dbe61611f6c2d4817cfbaad2a3055" dependencies: @@ -2035,7 +2035,7 @@ ember-app-scheduler@0.0.5: dependencies: ember-cli-babel "^5.1.7" -ember-cli-babel@^5.1.3, 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.3, 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: @@ -2111,7 +2111,7 @@ ember-cli-htmlbars-inline-precompile@^0.4.4: hash-for-dep "^1.0.2" silent-error "^1.1.0" -ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.3.0: +ember-cli-htmlbars@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.0.tgz#e090f011239153bf45dab29625f94a46fce205af" dependencies: @@ -2184,17 +2184,16 @@ ember-cli-preprocess-registry@^3.0.0: process-relative-require "^1.0.0" silent-error "^1.0.0" -ember-cli-qunit@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-3.1.2.tgz#f47063ad6af0c69cd76661ccfefd453a10d7a93b" +ember-cli-qunit@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.0.0.tgz#1f0022469a5bd64f627b8102880a25e94e533a3b" dependencies: - broccoli-babel-transpiler "^5.5.0" broccoli-funnel "^1.0.1" - broccoli-merge-trees "^1.1.0" - ember-cli-babel "^5.1.5" - ember-cli-test-loader "^1.1.1" + broccoli-merge-trees "^2.0.0" + ember-cli-babel "^6.0.0-beta.7" + ember-cli-test-loader "^2.0.0" ember-cli-version-checker "^1.1.4" - ember-qunit "^2.0.0-beta.1" + ember-qunit "^2.1.3" qunit-notifications "^0.1.1" qunitjs "^2.0.1" resolve "^1.1.6" @@ -2216,11 +2215,11 @@ ember-cli-test-info@^1.0.0: dependencies: ember-cli-string-utils "^1.0.0" -ember-cli-test-loader@^1.1.1: - 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.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.1.0.tgz#16163bae0ac32cad1af13c4ed94c6c698b54d431" dependencies: - ember-cli-babel "^5.2.1" + ember-cli-babel "^6.0.0-beta.7" ember-cli-uglify@^1.2.0: version "1.2.0" @@ -2367,11 +2366,11 @@ ember-load-initializers@^1.0.0: dependencies: ember-cli-babel "^6.0.0-beta.7" -ember-qunit@^2.0.0-beta.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.1.2.tgz#ede8e56f098206c1d0834a592acefa0c47dc9ad7" +ember-qunit@^2.1.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.2.0.tgz#3cdf400031c93a38de781a7304819738753b7f99" dependencies: - ember-test-helpers "^0.6.0-beta.1" + ember-test-helpers "^0.6.3" ember-resolver@^4.1.0: version "4.1.0" @@ -2395,7 +2394,7 @@ ember-router-generator@^1.0.0: dependencies: recast "^0.11.3" -ember-test-helpers@^0.6.0-beta.1: +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"