From 3236bd4fe2ea95da8ada55084cbc6dd7d5e181be Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 5 Sep 2016 16:21:37 -0700 Subject: [PATCH] ENH: upgrade ember 2.7 --- .jshintrc | 3 +-- .travis.yml | 2 ++ README.md | 2 +- app/index.html | 8 ++++---- app/router.js | 3 ++- bower.json | 3 +-- config/environment.js | 3 +-- package.json | 8 ++++---- tests/.jshintrc | 3 +-- tests/helpers/destroy-app.js | 1 - tests/index.html | 17 ++++++++--------- 11 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.jshintrc b/.jshintrc index 2f30d16..d421faa 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,6 +1,5 @@ { "predef": [ - "server", "document", "window", "-Promise" @@ -28,6 +27,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/.travis.yml b/.travis.yml index 64533be..e072a03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,9 @@ cache: before_install: - npm config set spin false - npm install -g bower + - bower --version - npm install phantomjs-prebuilt + - phantomjs --version install: - npm install diff --git a/README.md b/README.md index 7da9f35..795c0e6 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ You will need the following things properly installed on your computer. ## Running / Development -* `ember server` +* `ember serve` * Visit your app at [http://localhost:4200](http://localhost:4200). ### Code Generators diff --git a/app/index.html b/app/index.html index ce8308d..6ae09c4 100644 --- a/app/index.html +++ b/app/index.html @@ -9,16 +9,16 @@ {{content-for "head"}} - - + + {{content-for "head-footer"}} {{content-for "body"}} - - + + {{content-for "body-footer"}} diff --git a/app/router.js b/app/router.js index 3bba78e..cdc2578 100644 --- a/app/router.js +++ b/app/router.js @@ -2,7 +2,8 @@ import Ember from 'ember'; import config from './config/environment'; const Router = Ember.Router.extend({ - location: config.locationType + location: config.locationType, + rootURL: config.rootURL }); Router.map(function() { diff --git a/bower.json b/bower.json index 5edd13e..90b3389 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,8 @@ { "name": "ccdb-web", "dependencies": { - "ember": "~2.6.0", + "ember": "~2.7.0", "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", "ember-qunit-notifications": "0.1.0", "pretender": "~1.1.0", "Faker": "~3.1.0" diff --git a/config/environment.js b/config/environment.js index 2fd8820..7eda992 100644 --- a/config/environment.js +++ b/config/environment.js @@ -4,7 +4,7 @@ module.exports = function(environment) { var ENV = { modulePrefix: 'ccdb-web', environment: environment, - baseURL: '/', + rootURL: '/', locationType: 'auto', EmberENV: { FEATURES: { @@ -29,7 +29,6 @@ module.exports = function(environment) { if (environment === 'test') { // Testem prefers this... - ENV.baseURL = '/'; ENV.locationType = 'none'; // keep test console output quieter diff --git a/package.json b/package.json index 09e5081..4c8c793 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.4.2", "ember-ajax": "^2.0.1", - "ember-cli": "2.6.2", + "ember-cli": "2.7.0", "ember-cli-app-version": "^1.0.0", "ember-cli-babel": "^5.1.6", "ember-cli-dependency-checker": "^1.2.0", @@ -32,13 +32,13 @@ "ember-cli-jshint": "^1.0.0", "ember-cli-mirage": "0.2.1", "ember-cli-moment-shim": "2.0.0", - "ember-cli-qunit": "^1.4.0", + "ember-cli-qunit": "^2.0.0", "ember-cli-release": "^0.2.9", "ember-cli-sri": "^2.1.0", + "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.6.0", + "ember-data": "^2.7.0", "ember-django-adapter": "1.1.2", - "ember-engines": "0.2.6", "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1", "ember-moment": "7.0.0-beta.3", diff --git a/tests/.jshintrc b/tests/.jshintrc index 4f9f51d..d2bd113 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -1,6 +1,5 @@ { "predef": [ - "server", "document", "window", "location", @@ -48,6 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js index 3a0114a..c3d4d1a 100644 --- a/tests/helpers/destroy-app.js +++ b/tests/helpers/destroy-app.js @@ -2,5 +2,4 @@ import Ember from 'ember'; export default function destroyApp(application) { Ember.run(application, 'destroy'); - server.shutdown(); } diff --git a/tests/index.html b/tests/index.html index d504b18..85cff10 100644 --- a/tests/index.html +++ b/tests/index.html @@ -10,9 +10,9 @@ {{content-for "head"}} {{content-for "test-head"}} - - - + + + {{content-for "head-footer"}} {{content-for "test-head-footer"}} @@ -21,12 +21,11 @@ {{content-for "body"}} {{content-for "test-body"}} - - - - - - + + + + + {{content-for "body-footer"}} {{content-for "test-body-footer"}}