diff --git a/.eslintignore b/.eslintignore index fd20a38..72df373 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,6 +8,7 @@ # dependencies /bower_components/ +/node_modules/ # misc /coverage/ diff --git a/.npmignore b/.npmignore index 6032b25..82ca2cb 100644 --- a/.npmignore +++ b/.npmignore @@ -17,6 +17,7 @@ /.watchmanconfig /bower.json /config/ember-try.js +/CONTRIBUTING.md /ember-cli-build.js /testem.js /tests/ diff --git a/.travis.yml b/.travis.yml index 15ad634..4acae48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,12 @@ env: # See https://git.io/vdao3 for details. - JOBS=1 +branches: + only: + - master + # npm version tags + - /^v\d+\.\d+\.\d+/ + jobs: fail_fast: true allow_failures: @@ -39,6 +45,7 @@ jobs: - stage: "Additional Tests" env: EMBER_TRY_SCENARIO=ember-lts-2.16 - env: EMBER_TRY_SCENARIO=ember-lts-2.18 + - env: EMBER_TRY_SCENARIO=ember-lts-3.4 - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..cd910b1 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,26 @@ +# How To Contribute + +## Installation + +* `git clone ` +* `cd my-addon` +* `yarn install` + +## Linting + +* `yarn run lint:hbs` +* `yarn run lint:js` +* `yarn run lint:js -- --fix` + +## Running tests + +* `ember test` – Runs the test suite on the current Ember version +* `ember test --server` – Runs the test suite in "watch mode" +* `ember try:each` – Runs the test suite against multiple Ember versions + +## Running the dummy application + +* `ember serve` +* Visit the dummy application at [http://localhost:4200](http://localhost:4200). + +For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/). diff --git a/LICENSE.md b/LICENSE.md index 02000b5..f8d1edb 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 +Copyright (c) 2019 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 66a77a9..dc93b89 100644 --- a/README.md +++ b/README.md @@ -44,34 +44,6 @@ test(".runCallback() should run the callback passed", function(assert) { Check out [ember-sinon-qunit](https://github.com/elwayman02/ember-sinon-qunit) for integration with Ember-QUnit! -Contributing ------------------------------------------------------------------------------- - -### Installation - -* `git clone git@github.com:csantero/ember-sinon.git` -* `cd my-addon` -* `npm install` - -### Linting - -* `npm run lint:hbs` -* `npm run lint:js` -* `npm run lint:js -- --fix` - -### Running tests - -* `ember test` – Runs the test suite on the current Ember version -* `ember test --server` – Runs the test suite in "watch mode" -* `ember try:each` – Runs the test suite against multiple Ember versions - -### Running the dummy application - -* `ember serve` -* Visit the dummy application at [http://localhost:4200](http://localhost:4200). - -For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/). - License ------------------------------------------------------------------------------ diff --git a/config/ember-try.js b/config/ember-try.js index 2ca5a55..660c322 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -14,7 +14,7 @@ module.exports = function() { { name: 'ember-lts-2.16', env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) }, npm: { devDependencies: { @@ -26,7 +26,7 @@ module.exports = function() { { name: 'ember-lts-2.18', env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) }, npm: { devDependencies: { @@ -35,6 +35,14 @@ module.exports = function() { } } }, + { + name: 'ember-lts-3.4', + npm: { + devDependencies: { + 'ember-source': '~3.4.0' + } + } + }, { name: 'ember-release', npm: { @@ -59,6 +67,10 @@ module.exports = function() { } } }, + // The default `.travis.yml` runs this scenario via `npm test`, + // not via `ember try`. It's still included here so that running + // `ember try:each` manually or from a customized CI config will run it + // along with all the other scenarios. { name: 'ember-default', npm: { diff --git a/package.json b/package.json index eb7264a..e3da431 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@ember/optional-features": "^0.6.3", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~3.5.0", + "ember-cli": "~3.6.1", "ember-cli-app-version": "^3.1.0", "ember-cli-dependency-checker": "^3.0.0", "ember-cli-eslint": "^5.0.0",