From 0af9823bacc0cf005ec245c0e763836f4d679ece Mon Sep 17 00:00:00 2001 From: Cory Forsyth Date: Wed, 20 Apr 2016 18:14:12 -0400 Subject: [PATCH] upgrade to ember-cli 1.13.12 --- .ember-cli | 3 +-- .npmignore | 1 - .watchmanconfig | 2 +- bower.json | 10 +++++----- config/environment.js | 1 + ember-cli-build.js | 5 +++-- package.json | 24 ++++++++++++------------ tests/dummy/app/app.js | 4 ++-- tests/dummy/app/router.js | 2 +- tests/helpers/destroy-app.js | 5 +++++ tests/helpers/module-for-acceptance.js | 23 +++++++++++++++++++++++ tests/helpers/resolver.js | 2 +- tests/helpers/start-app.js | 2 +- tests/index.html | 5 +++-- 14 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 tests/helpers/destroy-app.js create mode 100644 tests/helpers/module-for-acceptance.js diff --git a/.ember-cli b/.ember-cli index 927fabe..ee64cfe 100644 --- a/.ember-cli +++ b/.ember-cli @@ -5,6 +5,5 @@ Setting `disableAnalytics` to true will prevent any data from being sent. */ - "disableAnalytics": false, - "usePods": true + "disableAnalytics": false } diff --git a/.npmignore b/.npmignore index d522ca2..49996f5 100644 --- a/.npmignore +++ b/.npmignore @@ -10,6 +10,5 @@ dist/ .npmignore **/.gitkeep bower.json -ember-cli-build.js Brocfile.js testem.json diff --git a/.watchmanconfig b/.watchmanconfig index 5e9462c..e7834e3 100644 --- a/.watchmanconfig +++ b/.watchmanconfig @@ -1,3 +1,3 @@ { - "ignore_dirs": ["tmp"] + "ignore_dirs": ["tmp", "dist"] } diff --git a/bower.json b/bower.json index 0ce7654..9998105 100644 --- a/bower.json +++ b/bower.json @@ -2,12 +2,12 @@ "name": "ember-mobiledoc-editor", "dependencies": { "ember": "~2.2.0", - "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.6", - "ember-cli-test-loader": "ember-cli-test-loader#0.2.1", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7", + "ember-cli-shims": "0.0.6", + "ember-cli-test-loader": "0.2.1", + "ember-load-initializers": "0.1.7", "ember-qunit": "^0.4.16", - "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.18", + "ember-qunit-notifications": "0.1.0", + "ember-resolver": "~0.1.20", "jquery": "~2.1.1", "loader.js": "ember-cli/loader.js#3.3.0", "qunit": "~1.20.0" diff --git a/config/environment.js b/config/environment.js index 0dfaed4..28a787b 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,3 +1,4 @@ +/*jshint node:true*/ 'use strict'; module.exports = function(/* environment, appConfig */) { diff --git a/ember-cli-build.js b/ember-cli-build.js index d37d64c..c8c48f8 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,8 +1,9 @@ +/*jshint node:true*/ /* global require, module */ -var EmberApp = require('ember-cli/lib/broccoli/ember-addon'); +var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { - var app = new EmberApp(defaults, { + var app = new EmberAddon(defaults, { // Add options here }); diff --git a/package.json b/package.json index 3a1543b..aeb3bd4 100644 --- a/package.json +++ b/package.json @@ -19,24 +19,24 @@ "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.1.2", + "broccoli-asset-rev": "^2.2.0", "conventional-changelog": "^1.1.0", "conventional-changelog-cli": "^1.1.0", - "ember-cli": "1.13.8", - "ember-cli-app-version": "0.5.0", + "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.0.1", + "ember-cli-dependency-checker": "^1.1.0", "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-ic-ajax": "0.2.1", + "ember-cli-ic-ajax": "0.2.4", "ember-cli-inject-live-reload": "^1.3.1", - "ember-cli-qunit": "^1.0.0", - "ember-cli-release": "0.2.3", - "ember-cli-sri": "^1.0.3", + "ember-cli-qunit": "^1.0.4", + "ember-cli-release": "0.2.8", + "ember-cli-sri": "^1.1.0", "ember-cli-uglify": "^1.2.0", "ember-disable-prototype-extensions": "^1.0.0", - "ember-disable-proxy-controllers": "^1.0.0", - "ember-export-application-global": "^1.0.3", - "ember-try": "0.0.6", + "ember-disable-proxy-controllers": "^1.0.1", + "ember-export-application-global": "^1.0.4", + "ember-try": "~0.0.8", "mobiledoc-dom-renderer": "^0.5.0" }, "keywords": [ @@ -47,7 +47,7 @@ "dependencies": { "broccoli-funnel": "^1.0.1", "broccoli-merge-trees": "^1.1.1", - "ember-cli-babel": "^5.1.3", + "ember-cli-babel": "^5.1.5", "ember-cli-htmlbars": "^1.0.0", "ember-wormhole": "^0.3.4", "mobiledoc-kit": "^0.9.4" diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 8d66b95..8b234d6 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -3,14 +3,14 @@ import Resolver from 'ember/resolver'; import loadInitializers from 'ember/load-initializers'; import config from './config/environment'; -var App; +let App; Ember.MODEL_FACTORY_INJECTIONS = true; App = Ember.Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, - Resolver: Resolver + Resolver }); loadInitializers(App, config.modulePrefix); diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index cef554b..3bba78e 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -1,7 +1,7 @@ import Ember from 'ember'; import config from './config/environment'; -var Router = Ember.Router.extend({ +const Router = Ember.Router.extend({ location: config.locationType }); diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js new file mode 100644 index 0000000..c3d4d1a --- /dev/null +++ b/tests/helpers/destroy-app.js @@ -0,0 +1,5 @@ +import Ember from 'ember'; + +export default function destroyApp(application) { + Ember.run(application, 'destroy'); +} diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js new file mode 100644 index 0000000..ed23003 --- /dev/null +++ b/tests/helpers/module-for-acceptance.js @@ -0,0 +1,23 @@ +import { module } from 'qunit'; +import startApp from '../helpers/start-app'; +import destroyApp from '../helpers/destroy-app'; + +export default function(name, options = {}) { + module(name, { + beforeEach() { + this.application = startApp(); + + if (options.beforeEach) { + options.beforeEach.apply(this, arguments); + } + }, + + afterEach() { + destroyApp(this.application); + + if (options.afterEach) { + options.afterEach.apply(this, arguments); + } + } + }); +} diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js index 9129fc8..ebfb4e4 100644 --- a/tests/helpers/resolver.js +++ b/tests/helpers/resolver.js @@ -1,7 +1,7 @@ import Resolver from 'ember/resolver'; import config from '../../config/environment'; -let resolver = Resolver.create(); +const resolver = Resolver.create(); resolver.namespace = { modulePrefix: config.modulePrefix, diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 5949d53..e098f1d 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -8,7 +8,7 @@ export default function startApp(attrs) { let attributes = Ember.merge({}, config.APP); attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; - Ember.run(function() { + Ember.run(() => { application = Application.create(attributes); application.setupForTesting(); application.injectTestHelpers(); diff --git a/tests/index.html b/tests/index.html index d413e51..1b05795 100644 --- a/tests/index.html +++ b/tests/index.html @@ -18,13 +18,14 @@ {{content-for 'test-head-footer'}} - {{content-for 'body'}} {{content-for 'test-body'}} + - + + {{content-for 'body-footer'}}