Skip to content

Commit

Permalink
chore(upgrade deps) ember 2.16, etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
kybishop committed Oct 19, 2017
1 parent 8e06080 commit b3cb070
Show file tree
Hide file tree
Showing 6 changed files with 228 additions and 234 deletions.
18 changes: 11 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ cache:
yarn: true

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-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-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
20 changes: 20 additions & 0 deletions MODULE_REPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## Module Report
### Unknown Global

**Global**: `Ember.undefined`

**Location**: `undefined` at line undefined

```js
undefined
```

### Unknown Global

**Global**: `Ember.undefined`

**Location**: `undefined` at line undefined

```js
undefined
```
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,42 +25,42 @@
"deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -"
},
"dependencies": {
"babel-eslint": "^8.0.0",
"babel-plugin-filter-imports": "^0.3.1",
"babel-eslint": "^8.0.1",
"babel-plugin-filter-imports": "^1.1.0",
"babel6-plugin-strip-class-callcheck": "^6.0.0",
"broccoli-funnel": "^2.0.1",
"ember-cli-babel": "^6.8.2",
"ember-cli-htmlbars": "^2.0.2",
"ember-cli-sass": "^7.0.0",
"ember-popper": "^0.6.4",
"ember-truth-helpers": "^1.3.0",
"ember-popper": "^0.6.5",
"ember-truth-helpers": "^2.0.0",
"eslint-plugin-ember-suave": "^1.0.0"
},
"devDependencies": {
"@html-next/flexi-config": "^2.0.0",
"@html-next/flexi-default-styles": "^2.0.1",
"@html-next/flexi-dsl": "^2.0.1",
"broccoli-asset-rev": "^2.4.5",
"ember-cli": "~2.15.0",
"ember-cli": "~2.16.2",
"ember-cli-dependency-checker": "^2.0.1",
"ember-cli-eslint": "^4.2.0",
"ember-cli-fastboot": "^1.0.5",
"ember-cli-fastboot": "^1.1.0",
"ember-cli-github-pages": "^0.1.2",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.7.0",
"ember-cli-qunit": "^4.0.1",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-cli-uglify": "^2.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-native-dom-event-dispatcher": "^0.6.3",
"ember-native-dom-helpers": "^0.5.3",
"ember-power-select": "^1.9.6",
"ember-power-select": "^1.9.11",
"ember-raf-test-waiter": "^0.1.0",
"ember-resolver": "^4.5.0",
"ember-source": "~2.15.0",
"ember-source": "~2.16.0",
"flexi": "^2.0.1",
"loader.js": "^4.5.1"
},
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: 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 Ember from 'ember';
import { resolve } from 'rsvp';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';

const { RSVP: { resolve } } = Ember;

export default function(name, options = {}) {
module(name, {
beforeEach() {
Expand Down
Loading

0 comments on commit b3cb070

Please sign in to comment.