From 83c583c1c802f01afb048e502a8962ff3c499fc7 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Thu, 15 Sep 2016 14:20:30 -0700 Subject: [PATCH 1/2] Fixed Depreciation --- addon/components/x-toggle/component.js | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addon/components/x-toggle/component.js b/addon/components/x-toggle/component.js index 43e8d8c..176cbeb 100644 --- a/addon/components/x-toggle/component.js +++ b/addon/components/x-toggle/component.js @@ -54,7 +54,7 @@ const xToggle = Ember.Component.extend({ const { value, _onValue, _offValue } = this.getProperties('value', '_onValue', '_offValue'); const validValues = a([_onValue, _offValue]); - if(validValues.contains(value)) { + if(validValues.includes(value)) { return value === _onValue; } else { return undefined; diff --git a/package.json b/package.json index a9c7b55..ee39632 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,9 @@ "ember" ], "dependencies": { + "ember-cli-babel": "^5.1.6", "ember-cli-htmlbars": "^1.0.3", - "ember-cli-babel": "^5.1.6" + "ember-runtime-enumerable-includes-polyfill": "^1.0.1" }, "ember-addon": { "configPath": "tests/dummy/config", From a40c3ebaa6397ad7d8518987b41744e0718b68a2 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Thu, 15 Sep 2016 15:22:13 -0700 Subject: [PATCH 2/2] ember-cli updated to 2.8.0 --- .jshintrc | 2 +- .travis.yml | 15 +++++++++------ bower.json | 6 ++---- ember-cli-build.js | 4 ++-- package.json | 21 +++++++++++---------- tests/.jshintrc | 2 +- tests/dummy/app/index.html | 8 ++++---- tests/dummy/app/router.js | 3 ++- tests/dummy/config/environment.js | 3 +-- tests/helpers/module-for-acceptance.js | 12 ++++++------ tests/index.html | 17 ++++++++--------- 11 files changed, 47 insertions(+), 46 deletions(-) diff --git a/.jshintrc b/.jshintrc index 08096ef..d421faa 100644 --- a/.jshintrc +++ b/.jshintrc @@ -27,6 +27,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/.travis.yml b/.travis.yml index ee67302..794f9c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - "0.12" + - "4" sudo: false @@ -22,14 +22,17 @@ matrix: - env: EMBER_TRY_SCENARIO=ember-canary before_install: - - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH - - "npm config set spin false" - - "npm install -g npm@^2" + - npm config set spin false + - npm install -g bower + - bower --version + - npm install phantomjs-prebuilt + - node_modules/phantomjs-prebuilt/bin/phantomjs --version install: - - npm install -g bower - npm install - bower install script: - - ember try $EMBER_TRY_SCENARIO test + # Usually, it's ok to finish the test scenario without reverting + # to the addon's original dependency state, skipping "cleanup". + - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup diff --git a/bower.json b/bower.json index 55ffe89..5fe7c46 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,7 @@ { "name": "ember-cli-toggle", "dependencies": { - "ember": "~2.4.3", - "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", - "ember-qunit-notifications": "0.1.0" + "ember": "~2.8.0", + "ember-cli-shims": "0.1.3" } } diff --git a/ember-cli-build.js b/ember-cli-build.js index f67621a..4ac3913 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,9 +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 ee39632..3155815 100644 --- a/package.json +++ b/package.json @@ -20,21 +20,22 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.4.2", - "ember-ajax": "0.7.1", - "ember-cli": "2.4.3", - "ember-cli-app-version": "^1.0.0", + "ember-ajax": "^2.0.1", + "ember-cli": "2.8.0", + "ember-cli-app-version": "^2.0.0", "ember-cli-dependency-checker": "^1.2.0", + "ember-cli-github-pages": "0.1.2", + "ember-cli-htmlbars-inline-precompile": "^0.3.1", "ember-cli-inject-live-reload": "^1.4.0", - "ember-cli-qunit": "^1.4.0", - "ember-cli-release": "0.2.8", + "ember-cli-jshint": "^2.0.1", + "ember-cli-qunit": "^3.0.1", + "ember-cli-release": "^1.0.0-beta.2", "ember-cli-sri": "^2.1.0", + "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.4.2", - "ember-export-application-global": "^1.0.5", + "ember-data": "^2.8.0", "ember-disable-prototype-extensions": "^1.1.0", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-try": "^0.2.2", - "ember-cli-github-pages": "0.0.8", + "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1", "ember-resolver": "^2.0.3", "loader.js": "^4.0.1" diff --git a/tests/.jshintrc b/tests/.jshintrc index 6ec0b7c..d2bd113 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -47,6 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 89ce2c9..a333a01 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -9,16 +9,16 @@ {{content-for "head"}} - - + + {{content-for "head-footer"}} {{content-for "body"}} - - + + {{content-for "body-footer"}} diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 3bba78e..cdc2578 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/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/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index ea50b41..d1db59a 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -4,7 +4,7 @@ module.exports = function(environment) { var ENV = { modulePrefix: 'dummy', environment: environment, - baseURL: '/ember-cli-toggle', + rootURL: '/ember-cli-toggle/', locationType: 'auto', EmberENV: { FEATURES: { @@ -36,7 +36,6 @@ module.exports = function(environment) { if (environment === 'test') { // Testem prefers this... - ENV.baseURL = '/'; ENV.locationType = 'none'; // keep test console output quieter diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index 8c8b74e..76996fd 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -1,23 +1,23 @@ import { module } from 'qunit'; +import Ember from 'ember'; import startApp from '../helpers/start-app'; import destroyApp from '../helpers/destroy-app'; +const { RSVP: { Promise } } = Ember; + export default function(name, options = {}) { module(name, { beforeEach() { this.application = startApp(); if (options.beforeEach) { - options.beforeEach.apply(this, arguments); + return options.beforeEach.apply(this, arguments); } }, afterEach() { - if (options.afterEach) { - options.afterEach.apply(this, arguments); - } - - destroyApp(this.application); + let afterEach = options.afterEach && options.afterEach.apply(this, arguments); + return Promise.resolve(afterEach).then(() => destroyApp(this.application)); } }); } diff --git a/tests/index.html b/tests/index.html index 64cb47e..f7ff652 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"}}