From 93a16dfd2a73bb2e018990cfae9468087dfb5a2a Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 28 Mar 2016 18:43:16 +0200 Subject: [PATCH 1/5] tests/index.html: Fix script order --- tests/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/index.html b/tests/index.html index 2d3ff6ade04..64cb47e31ff 100644 --- a/tests/index.html +++ b/tests/index.html @@ -21,10 +21,10 @@ {{content-for "body"}} {{content-for "test-body"}} + - From e0ce8f9c91284d421f25e08cd13c73113641f185 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 28 Mar 2016 19:11:00 +0200 Subject: [PATCH 2/5] Update "ember-cli" to v2.4.0 --- .npmignore | 2 +- package.json | 2 +- testem.json => testem.js | 5 +++-- tests/helpers/module-for-acceptance.js | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) rename testem.json => testem.js (83%) diff --git a/.npmignore b/.npmignore index 299ab96cbd8..b51700bad75 100644 --- a/.npmignore +++ b/.npmignore @@ -16,7 +16,7 @@ .watchmanconfig bower.json ember-cli-build.js -testem.json +testem.js *.gem *.gemspec diff --git a/package.json b/package.json index e63c2176bc2..8d5c9de0ad6 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "broccoli-uglify-sourcemap": "^1.0.1", "broccoli-yuidoc": "^2.1.0", "ember-ajax": "0.7.1", - "ember-cli": "2.3.0", + "ember-cli": "2.4.0", "ember-cli-app-version": "^1.0.0", "ember-cli-blueprint-test-helpers": "^0.9.0", "ember-cli-dependency-checker": "^1.2.0", diff --git a/testem.json b/testem.js similarity index 83% rename from testem.json rename to testem.js index d26cfc9cacb..c9bae137d2f 100644 --- a/testem.json +++ b/testem.js @@ -1,4 +1,5 @@ -{ +/*jshint node:true*/ +module.exports = { "framework": "qunit", "test_page": "tests/index.html?hidepassed", "disable_watching": true, @@ -10,4 +11,4 @@ "PhantomJS", "Chrome" ] -} +}; diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index ed23003db40..8c8b74ecb2b 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -13,11 +13,11 @@ export default function(name, options = {}) { }, afterEach() { - destroyApp(this.application); - if (options.afterEach) { options.afterEach.apply(this, arguments); } + + destroyApp(this.application); } }); } From 0a9140fb87ac6a5ae83389cac78f9426a344c066 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 28 Mar 2016 19:44:13 +0200 Subject: [PATCH 3/5] Update "ember-cli" to v2.4.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8d5c9de0ad6..19e7dd791a2 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "broccoli-uglify-sourcemap": "^1.0.1", "broccoli-yuidoc": "^2.1.0", "ember-ajax": "0.7.1", - "ember-cli": "2.4.0", + "ember-cli": "2.4.1", "ember-cli-app-version": "^1.0.0", "ember-cli-blueprint-test-helpers": "^0.9.0", "ember-cli-dependency-checker": "^1.2.0", @@ -64,7 +64,7 @@ "ember-cli-internal-test-helpers": "^0.8.1", "ember-cli-qunit": "^1.2.1", "ember-cli-release": "0.2.3", - "ember-cli-sri": "^2.0.0", + "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", "ember-dev": "emberjs/ember-dev#bcfb9c3487ec2fd58b932394a15ce16fd9cf7eed", "ember-disable-prototype-extensions": "^1.1.0", From 680f5125d0284de0f9e272418f92a3f46a5dd91c Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 28 Mar 2016 23:13:32 +0200 Subject: [PATCH 4/5] Update "ember-cli-blueprint-test-helpers" to v0.10.1 --- .npmignore | 1 + .../fixtures/addon/package/package.json | 37 ++----------------- node-tests/fixtures/app/package/package.json | 34 +---------------- node-tests/nodetest-runner.js | 14 ++----- package.json | 10 ++--- 5 files changed, 16 insertions(+), 80 deletions(-) diff --git a/.npmignore b/.npmignore index b51700bad75..707b5a5fdbb 100644 --- a/.npmignore +++ b/.npmignore @@ -21,3 +21,4 @@ testem.js *.gem *.gemspec **/*.rb +node-tests/ \ No newline at end of file diff --git a/node-tests/fixtures/addon/package/package.json b/node-tests/fixtures/addon/package/package.json index 5aaa25001a6..e6e50684368 100644 --- a/node-tests/fixtures/addon/package/package.json +++ b/node-tests/fixtures/addon/package/package.json @@ -1,49 +1,20 @@ { "name": "my-addon", "version": "0.0.0", - "description": "The default blueprint for ember-cli addons.", - "directories": { - "doc": "doc", - "test": "tests" - }, - "scripts": { - "build": "ember build", - "start": "ember server", - "test": "ember try:testall" - }, - "repository": "", + "description": "Addon fixture package for ember-cli-blueprint-test-helpers", "engines": { "node": ">= 0.10.0" }, - "author": "", - "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.1.2", - "ember-ajax": "0.6.2", - "ember-cli": "1.13.12", - "ember-cli-app-version": "^1.0.0", - "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "^1.1.0", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.3.1", - "ember-cli-qunit": "^1.0.1", - "ember-cli-release": "0.2.3", - "ember-cli-sri": "^1.0.3", - "ember-cli-uglify": "^1.2.0", - "ember-data": "2.0.0", - "ember-disable-proxy-controllers": "^1.0.0", - "ember-export-application-global": "^1.0.4", - "ember-resolver": "^2.0.2", - "ember-disable-prototype-extensions": "^1.0.0", - "ember-try": "~0.0.8", + "ember-cli": "*", "ember-data": "*" }, "keywords": [ "ember-addon" ], "dependencies": { - "ember-cli-htmlbars": "^1.0.0", - "ember-cli-babel": "^5.1.3" + "ember-cli-htmlbars": "*", + "ember-cli-babel": "*" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/node-tests/fixtures/app/package/package.json b/node-tests/fixtures/app/package/package.json index a97d1c6e103..768bc49c219 100644 --- a/node-tests/fixtures/app/package/package.json +++ b/node-tests/fixtures/app/package/package.json @@ -1,43 +1,13 @@ { "name": "my-app", "version": "0.0.0", - "description": "Small description for nested-project goes here", + "description": "App fixture package for ember-cli-blueprint-test-helpers", "private": true, - "directories": { - "doc": "doc", - "test": "tests" - }, - "scripts": { - "build": "ember build", - "start": "ember server", - "test": "ember test" - }, - "repository": "", "engines": { "node": ">= 0.10.0" }, - "author": "", - "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.1.2", - "ember-ajax": "0.6.2", - "ember-cli": "1.13.8", - "ember-cli-app-version": "^1.0.0", - "ember-cli-babel": "^5.1.3", - "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "^1.1.0", - "ember-cli-htmlbars": "^1.0.0", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.3.1", - "ember-cli-legacy-blueprints": "*", - "ember-cli-qunit": "^1.0.1", - "ember-cli-release": "0.2.3", - "ember-cli-sri": "^1.0.3", - "ember-cli-uglify": "^1.2.0", - "ember-data": "2.0.0", - "ember-disable-proxy-controllers": "^1.0.0", - "ember-export-application-global": "^1.0.4", - "ember-resolver": "^2.0.2", + "ember-cli": "*", "ember-data": "*" } } diff --git a/node-tests/nodetest-runner.js b/node-tests/nodetest-runner.js index cc3bdc2c481..1f81b257c96 100644 --- a/node-tests/nodetest-runner.js +++ b/node-tests/nodetest-runner.js @@ -2,27 +2,21 @@ var glob = require('glob'); var Mocha = require('mocha'); -var Promise = require('ember-cli/lib/ext/promise'); +var RSVP = require('rsvp'); var rimraf = require('rimraf'); var mochaOnlyDetector = require('mocha-only-detector'); -process.env.EMBER_DATA_SKIP_VERSION_CHECKING_DO_NOT_USE_THIS_ENV_VARIABLE = true; - -if (process.env.EOLNEWLINE) { - require('os').EOL = '\n'; -} - rimraf.sync('.node_modules-tmp'); rimraf.sync('.bower_components-tmp'); var root = 'node-tests/{blueprints,acceptance,unit}'; -var _checkOnlyInTests = Promise.denodeify(mochaOnlyDetector.checkFolder.bind(null, root + '/**/*{-test}.js')); +var _checkOnlyInTests = RSVP.denodeify(mochaOnlyDetector.checkFolder.bind(null, root + '/**/*{-test}.js')); var optionOrFile = process.argv[2]; var mocha = new Mocha({ timeout: 5000, reporter: 'spec' }); -var testFiles = glob.sync(root + '**/*-test.js'); +var testFiles = glob.sync(root + '/**/*-test.js'); /*var jshintPosition = testFiles.indexOf('tests/unit/jshint-test.js'); var jshint = testFiles.splice(jshintPosition, 1); @@ -62,7 +56,7 @@ function ciVerificationStep() { if (process.env.CI === 'true') { return checkOnlyInTests(); } else { - return Promise.resolve(); + return RSVP.Promise.resolve(); } } diff --git a/package.json b/package.json index 19e7dd791a2..f36e7c39658 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "ember-ajax": "0.7.1", "ember-cli": "2.4.1", "ember-cli-app-version": "^1.0.0", - "ember-cli-blueprint-test-helpers": "^0.9.0", + "ember-cli-blueprint-test-helpers": "0.10.1", "ember-cli-dependency-checker": "^1.2.0", "ember-cli-htmlbars": "^1.0.3", "ember-cli-htmlbars-inline-precompile": "^0.2.0", @@ -76,12 +76,12 @@ "ember-try": "^0.1.2", "ember-watson": "^0.7.0", "github": "^0.2.4", - "glob": "^5.0.13", + "glob": "5.0.13", "loader.js": "^4.0.0", - "mocha": "^2.3.4", + "mocha": "2.4.5", "mocha-only-detector": "0.0.2", - "rimraf": "^2.3.2", - "rsvp": "^3.1.0" + "rimraf": "2.5.2", + "rsvp": "3.2.1" }, "peerDependencies": { "ember-inflector": "^1.9.4" From 0885dcea0943c3e5e095e9c07f5379153e9d5d79 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 30 Mar 2016 17:42:11 +0200 Subject: [PATCH 5/5] Update "ember-cli-blueprint-test-helpers" to v0.10.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f36e7c39658..386e99424b6 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "ember-ajax": "0.7.1", "ember-cli": "2.4.1", "ember-cli-app-version": "^1.0.0", - "ember-cli-blueprint-test-helpers": "0.10.1", + "ember-cli-blueprint-test-helpers": "0.10.2", "ember-cli-dependency-checker": "^1.2.0", "ember-cli-htmlbars": "^1.0.3", "ember-cli-htmlbars-inline-precompile": "^0.2.0",