Skip to content

Commit

Permalink
Merge pull request #169 from elwayman02/3.1
Browse files Browse the repository at this point in the history
ember 3.1
  • Loading branch information
Dhaulagiri authored Apr 17, 2018
2 parents 8a895fe + 8aa3c19 commit 51632b6
Show file tree
Hide file tree
Showing 5 changed files with 648 additions and 68 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@ module.exports = {
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ Key | Type | Description

### Running Tests

* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
* `ember test`
* `ember test --server`
* `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

### Building

Expand Down
2 changes: 1 addition & 1 deletion config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary'),
getChannelURL('canary')
]).then((urls) => {
return {
useYarn: true,
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
"build": "ember build",
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests mirage-support",
"start": "ember serve",
"test": "ember try:each",
"changelog": "lerna-changelog"
"test": "ember test",
"changelog": "lerna-changelog",
"test:all": "ember try:each"
},
"dependencies": {
"broccoli-funnel": "^2.0.1",
Expand All @@ -31,7 +32,7 @@
"bootstrap": "^4.0.0",
"broccoli-asset-rev": "^2.4.5",
"ember-bootstrap": "^1.2.0",
"ember-cli": "~3.0.0",
"ember-cli": "~3.1.2",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-htmlbars": "^2.0.1",
Expand All @@ -50,7 +51,7 @@
"ember-load-initializers": "^1.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-resolver": "^4.0.0",
"ember-source": "~3.0.0",
"ember-source": "~3.1.0",
"ember-source-channel-url": "^1.0.1",
"ember-try": "^0.2.23",
"eslint-plugin-ember": "^5.0.0",
Expand Down
Loading

0 comments on commit 51632b6

Please sign in to comment.