From 21be151cb2857c56a3cdbe7f7f93fd01572fa784 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 12 Nov 2015 14:37:44 +0100 Subject: [PATCH 1/2] Update ember-cli to v1.13.12 --- .watchmanconfig | 2 +- app/app.js | 4 ++-- app/router.js | 2 +- bower.json | 18 ++++++++--------- package.json | 28 +++++++++++++------------- tests/helpers/destroy-app.js | 5 +++++ tests/helpers/module-for-acceptance.js | 23 +++++++++++++++++++++ tests/helpers/resolver.js | 2 +- tests/helpers/start-app.js | 6 +++--- tests/index.html | 5 +++-- 10 files changed, 62 insertions(+), 33 deletions(-) create mode 100644 tests/helpers/destroy-app.js create mode 100644 tests/helpers/module-for-acceptance.js diff --git a/.watchmanconfig b/.watchmanconfig index 5e9462c2005..e7834e3e4f3 100644 --- a/.watchmanconfig +++ b/.watchmanconfig @@ -1,3 +1,3 @@ { - "ignore_dirs": ["tmp"] + "ignore_dirs": ["tmp", "dist"] } diff --git a/app/app.js b/app/app.js index d1c7c209956..ab6ba82db47 100644 --- a/app/app.js +++ b/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/app/router.js b/app/router.js index 3f4018ab3f0..68d6baf73d2 100644 --- a/app/router.js +++ b/app/router.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import config from './config/environment'; import googlePageview from 'cargo/mixins/google-pageview'; -var Router = Ember.Router.extend(googlePageview, { +const Router = Ember.Router.extend(googlePageview, { location: config.locationType }); diff --git a/bower.json b/bower.json index 22664a72f29..6cb8106177c 100644 --- a/bower.json +++ b/bower.json @@ -1,17 +1,17 @@ { "name": "cargo", "dependencies": { - "ember": "1.13.7", - "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", - "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-data": "1.13.9", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", - "ember-qunit": "0.4.9", - "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.18", + "ember": "1.13.10", + "ember-cli-shims": "0.0.6", + "ember-cli-test-loader": "0.2.1", + "ember-data": "1.13.15", + "ember-load-initializers": "0.1.7", + "ember-qunit": "0.4.16", + "ember-qunit-notifications": "0.1.0", + "ember-resolver": "~0.1.20", "jquery": "^1.11.3", "loader.js": "ember-cli/loader.js#3.2.1", - "qunit": "~1.18.0", + "qunit": "~1.20.0", "ember-cli-moment-shim": "~0.1.0", "moment": ">= 2.8.0", "moment-timezone": ">= 0.1.0", diff --git a/package.json b/package.json index 9eea24d76c9..371f75b45f3 100644 --- a/package.json +++ b/package.json @@ -19,25 +19,25 @@ "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.1.2", - "ember-cli": "1.13.8", - "ember-cli-app-version": "0.5.0", - "ember-cli-babel": "^5.1.3", - "ember-cli-dependency-checker": "^1.0.1", - "ember-cli-htmlbars": "0.7.9", - "ember-cli-htmlbars-inline-precompile": "^0.2.0", - "ember-cli-ic-ajax": "0.2.1", + "broccoli-asset-rev": "^2.2.0", + "ember-cli": "1.13.12", + "ember-cli-app-version": "^1.0.0", + "ember-cli-babel": "^5.1.5", + "ember-cli-dependency-checker": "^1.1.0", + "ember-cli-htmlbars": "^1.0.1", + "ember-cli-htmlbars-inline-precompile": "^0.3.1", + "ember-cli-ic-ajax": "0.2.4", "ember-cli-inject-live-reload": "^1.3.1", "ember-cli-moment-shim": "0.6.2", - "ember-cli-qunit": "^1.0.0", - "ember-cli-release": "0.2.3", + "ember-cli-qunit": "^1.0.4", + "ember-cli-release": "0.2.8", "ember-cli-sass": "5.0.1", - "ember-cli-sri": "^1.0.3", + "ember-cli-sri": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "1.13.9", - "ember-disable-proxy-controllers": "^1.0.0", + "ember-data": "1.13.15", + "ember-disable-proxy-controllers": "^1.0.1", "ember-document-title": "~0.1.2", - "ember-export-application-global": "^1.0.3", + "ember-export-application-global": "^1.0.4", "ember-moment": "4.1.0", "emberx-select": "2.0.2" } diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js new file mode 100644 index 00000000000..c3d4d1abb5d --- /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 00000000000..ed23003db40 --- /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 28f4ece46a0..ebfb4e4d455 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'; -var 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 0f7aab1afb5..e098f1d5be6 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -3,12 +3,12 @@ import Application from '../../app'; import config from '../../config/environment'; export default function startApp(attrs) { - var application; + let application; - var attributes = Ember.merge({}, config.APP); + 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 f4a0d3efd85..c91bb55d504 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'}} From 9d6821786b0401a172350fb7739ddc9a7d633d5a Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 11 Nov 2015 12:04:19 +0100 Subject: [PATCH 2/2] routes/index: Fix versions array bug see https://github.com/rust-lang/crates.io/pull/208#issuecomment-155714465 --- app/routes/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/routes/index.js b/app/routes/index.js index 030f4ba5480..132cab9880a 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -5,7 +5,12 @@ export default Ember.Route.extend({ model() { function addCrates(store, crates) { for (var i = 0; i < crates.length; i++) { - crates[i] = store.push(store.normalize('crate', crates[i])); + const crate = crates[i]; + if (crate.versions == null) { + // passing `null` will return an empty versions array + delete crate.versions; + } + crates[i] = store.push(store.normalize('crate', crate)); } }