Skip to content

Commit

Permalink
Update "ember-cli-blueprint-test-helpers" to v0.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Turbo87 committed Mar 29, 2016
1 parent 7f806a6 commit 9ca7bf5
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 80 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ testem.js
*.gem
*.gemspec
**/*.rb
node-tests/
37 changes: 4 additions & 33 deletions node-tests/fixtures/addon/package/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
34 changes: 2 additions & 32 deletions node-tests/fixtures/app/package/package.json
Original file line number Diff line number Diff line change
@@ -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": "*"
}
}
14 changes: 4 additions & 10 deletions node-tests/nodetest-runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -62,7 +56,7 @@ function ciVerificationStep() {
if (process.env.CI === 'true') {
return checkOnlyInTests();
} else {
return Promise.resolve();
return RSVP.Promise.resolve();
}
}

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down

0 comments on commit 9ca7bf5

Please sign in to comment.