Skip to content

Commit

Permalink
update ember-cli 2.16.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelly Selden committed Oct 21, 2017
1 parent 5aa9082 commit 82e71a4
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 35 deletions.
24 changes: 15 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,19 @@ cache:
- $HOME/.npm

env:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default
global:
# See https://git.io/vdao3 for details.
- JOBS=1
matrix:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
Expand Down Expand Up @@ -63,4 +67,6 @@ before_install:
- npm --version

script:
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
9 changes: 7 additions & 2 deletions addon/create-class-computed.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import Ember from 'ember';
import EmberObject, { computed, observer, get, setProperties } from '@ember/object';
import EmberObject, {
computed,
observer,
get,
setProperties,
defineProperty
} from '@ember/object';
import Component from '@ember/component';
import { on } from '@ember/object/evented';
// import { getOwner } from '@ember/application';
Expand All @@ -13,7 +19,6 @@ import {

const {
WeakMap,
defineProperty,
meta
} = Ember;

Expand Down
4 changes: 1 addition & 3 deletions addon/expand-property.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import Ember from 'ember';

const { expandProperties } = Ember;
import { expandProperties } from '@ember/object/computed';

export default function(property) {
let newPropertyList = [];
Expand Down
4 changes: 1 addition & 3 deletions addon/is-computed.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import Ember from 'ember';

const { ComputedProperty } = Ember;
import ComputedProperty from '@ember/object/computed';

export default function(key) {
return key instanceof ComputedProperty;
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"ember-weakmap": "^3.0.0"
},
"devDependencies": {
"ember-cli": "~2.15.1",
"ember-cli": "~2.16.2",
"ember-cli-blueprint-test-helpers": "^0.18.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.0.0",
Expand All @@ -40,7 +40,7 @@
"ember-macro-test-helpers": "^3.1.0",
"ember-resolver": "^4.0.0",
"ember-sinon": "^1.0.0",
"ember-source": "~2.15.0",
"ember-source": "~2.16.0",
"eslint-config-sane": "^0.2.1",
"loader.js": "^4.2.3",
"mocha": "^4.0.0"
Expand Down
15 changes: 9 additions & 6 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ module.exports = {
'Chrome'
],
browser_args: {
Chrome: [
'--disable-gpu',
'--headless',
'--remote-debugging-port=9222',
'--window-size=1440,900'
]
Chrome: {
mode: 'ci',
args: [
'--disable-gpu',
'--headless',
'--remote-debugging-port=9222',
'--window-size=1440,900'
]
},
}
};
4 changes: 2 additions & 2 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import BaseRouter from '@ember/routing/router';
import EmberRouter from '@ember/routing/router';
import config from './config/environment';

const Router = BaseRouter.extend({
const Router = EmberRouter.extend({
location: config.locationType,
rootURL: config.rootURL
});
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = function(environment) {
}

if (environment === 'production') {

// here you can enable a production-specific feature
}

return ENV;
Expand Down
4 changes: 1 addition & 3 deletions tests/helpers/module-for-acceptance.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { module } from 'qunit';
import RSVP from 'rsvp';
import { resolve } from 'rsvp';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';

const { resolve } = RSVP;

export default function(name, options = {}) {
module(name, {
beforeEach() {
Expand Down
8 changes: 4 additions & 4 deletions tests/helpers/start-app.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { run } from '@ember/runloop';
import Ember from 'ember';
import Application from '../../app';
import config from '../../config/environment';
import { merge } from '@ember/polyfills';
import { run } from '@ember/runloop';

export default function startApp(attrs) {
let attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
let attributes = merge({}, config.APP);
attributes = merge(attributes, attrs); // use defaults, but you can override;

return run(() => {
let application = Application.create(attributes);
Expand Down

0 comments on commit 82e71a4

Please sign in to comment.