Merge branch 'feature/update_ember' into develop

GerritSommer · Jun 20, 2018 · 2e1a6de · 2e1a6de
2 parents 7e4226b + 93c777e
commit 2e1a6de
Show file tree

Hide file tree

Showing 7 changed files with 7,403 additions and 2,055 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+/blueprints/*/files/**/*.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -20,15 +20,17 @@ module.exports = {
     // node files
     {
       files: [
+        'ember-cli-build.js',
         'index.js',
         'testem.js',
-        'ember-cli-build.js',
+        'blueprints/*/index.js',
         'config/**/*.js',
         'tests/dummy/config/**/*.js'
       ],
       excludedFiles: [
-        'app/**',
         'addon/**',
+        'addon-test-support/**',
+        'app/**',
         'tests/dummy/app/**'
       ],
       parserOptions: {

diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ Contributing
 
 * `ember test` – Runs the test suite on the current Ember version
 * `ember test --server` – Runs the test suite in "watch mode"
-* `npm test` – Runs `ember try:each` to test your addon against multiple Ember versions
+* `ember try:each` – Runs the test suite against multiple Ember versions
 
 ### Running the dummy application
 

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -6,7 +6,7 @@ module.exports = function() {
   return Promise.all([
     getChannelURL('release'),
     getChannelURL('beta'),
-    getChannelURL('canary'),
+    getChannelURL('canary')
   ]).then((urls) => {
     return {
       scenarios: [