chore(package): update ember-cli to version 2.13.0

Closes #85 https://greenkeeper.io/
kellyselden · Apr 30, 2017 · 8629ad7 · 8629ad7
1 parent b94ccb1
commit 8629ad7
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',

diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ sudo: false
 cache:
   directories:
     - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
 
 env:
   - NPM_RUN_NODETEST=true
@@ -28,13 +27,12 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
+  - npm install -g phantomjs-prebuilt
   - phantomjs --version
 
 install:
   - npm install
-  - bower install
+
 
 script:
   - test "$NPM_RUN_NODETEST" != true || npm run nodetest

diff --git a/bower.json b/bower.json
diff --git a/package.json b/package.json
@@ -26,14 +26,14 @@
     "ember-weakmap": "^2.0.0"
   },
   "devDependencies": {
-    "ember-cli": "2.12.2",
+    "ember-cli": "2.13.0",
     "ember-cli-blueprint-test-helpers": "^0.17.0",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-eslint": "^3.0.0",
     "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
-    "ember-cli-shims": "^1.0.2",
+    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-shims": "^1.1.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-macro-test-helpers": "^2.0.0",
     "ember-resolver": "^4.0.0",

diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -0,0 +1,10 @@
+/* eslint-env node */
+
+module.exports = {
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
 import {
   setResolver
 } from 'ember-qunit';
+import { start } from 'ember-cli-qunit';
 
 setResolver(resolver);
+start();