sync CI scripts with ember-cli output

Author: xg-wang

.travis.yml

@@ -4,6 +4,8 @@ node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
   - "6"
+  - "8"
+  - "10"
 
 sudo: false
 dist: trusty
@@ -19,20 +21,37 @@ env:
   global:
     # See https://git.io/vdao3 for details.
     - JOBS=1
-  matrix:
+
+jobs:
+  fail_fast: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
+  include:
+    # runs linting and tests with current locked deps
+
+    - stage: "Tests"
+      name: "Tests"
+      install:
+        - yarn install --non-interactive
+      script:
+        - yarn lint:js
+        - yarn test
+        - yarn test:node
+
+    - name: "Floating Dependencies"
+      script:
+        - yarn test
+
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - EMBER_TRY_SCENARIO=ember-lts-2.16
-    - EMBER_TRY_SCENARIO=ember-lts-2.18
-    - EMBER_TRY_SCENARIO=ember-release
-    - EMBER_TRY_SCENARIO=ember-beta
-    - EMBER_TRY_SCENARIO=ember-canary
-    - EMBER_TRY_SCENARIO=ember-default
-
-matrix:
-  fast_finish: true
-  allow_failures:
+    - stage: "Additional Tests"
+      env: EMBER_TRY_SCENARIO=ember-lts-2.16
+    - env: EMBER_TRY_SCENARIO=ember-lts-2.18
+    - env: EMBER_TRY_SCENARIO=ember-release
+    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -42,8 +61,4 @@ install:
   - yarn install --no-lockfile --non-interactive
 
 script:
-  - yarn lint:js
-  - yarn test:node
-  # Usually, it's ok to finish the test scenario without reverting
-  #  to the addon's original dependency state, skipping "cleanup".
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

appveyor.yml

@@ -6,23 +6,26 @@ init:
 
 # Test against these versions of Node.js.
 environment:
+  MOCHA_REPORTER: "mocha-appveyor-reporter"
   matrix:
     - nodejs_version: "6"
+    - nodejs_version: "8"
+    - nodejs_version: "10"
 
 # Install scripts. (runs after repo cloning)
 install:
-  - git rev-parse HEAD
-  # Typical npm stuff.
-  - md C:\nc
-  - npm config set cache C:\nc
-  - yarn install
-
-# Post-install test scripts.
-test_script:
+  - ps: Install-Product node $env:nodejs_version
+  - yarn
+  - yarn add mocha-appveyor-reporter
   # Output useful info for debugging.
   - node --version
   - yarn --version
+
+# Post-install test scripts.
+test_script:
+  - git rev-parse HEAD
   - yarn test
+  - yarn test:node
 
 # Don't actually build.
 build: off

config/ember-try.js

@@ -7,22 +7,29 @@ module.exports = function() {
     getChannelURL('release'),
     getChannelURL('beta'),
     getChannelURL('canary')
-  ]).then(urls => {
+  ]).then((urls) => {
     return {
-      useYarn: true,
       scenarios: [
         {
           name: 'ember-lts-2.16',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
+          },
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.1',
               'ember-source': '~2.16.0'
             }
           }
         },
         {
           name: 'ember-lts-2.18',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
+          },
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.1',
               'ember-source': '~2.18.0'
             }
           }
@@ -56,8 +63,21 @@ module.exports = function() {
           npm: {
             devDependencies: {}
           }
+        },
+        {
+          name: 'ember-default-with-jquery',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({
+              'jquery-integration': true
+            })
+          },
+          npm: {
+            devDependencies: {
+              '@ember/jquery': '^0.5.1'
+            }
+          }
         }
       ]
     };
   });
-};
+};

package.json

@@ -16,9 +16,10 @@
     "build": "ember build",
     "changelog": "lerna-changelog",
     "lint:js": "eslint . --cache",
-    "start": "ember server",
-    "test": "npm run test:node && ember try:each",
-    "test:node": "mocha"
+    "start": "ember serve",
+    "test": "ember test",
+    "test:node": "mocha",
+    "test:all": "mocha && ember try:each"
   },
   "dependencies": {
     "abortcontroller-polyfill": "^1.2.1",