diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 959e169..0000000 --- a/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "bower_components", - "analytics": false -} diff --git a/.eslintrc.js b/.eslintrc.js index fbfc364..2873e2f 100644 --- 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 index 68d3d49..7d78b71 100644 --- 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 deleted file mode 100644 index aa22efa..0000000 --- a/bower.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "ember-macro-helpers", - "dependencies": {} -} diff --git a/package.json b/package.json index a322665..eb3c0a5 100644 --- 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 new file mode 100644 index 0000000..2bebfac --- /dev/null +++ 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 index e6cfb70..f219659 100644 --- 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();