Merge pull request #600 from thoov/fixing-test-suite

Fix test suite to run mocha variants during CI

Author: ef4

.eslintrc.js

@@ -1,8 +1,14 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
-    sourceType: 'module'
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   plugins: [
     'ember'
@@ -14,8 +20,7 @@ module.exports = {
   env: {
     browser: true
   },
-  rules: {
-  },
+  rules: {},
   overrides: [
     // node files
     {
@@ -31,43 +36,40 @@ module.exports = {
         'blueprints/*/index.js',
         'config/**/*.js',
         'tests/dummy/config/**/*.js',
-        'lib/**/*.js'
+        'lib/**/*'
       ],
       excludedFiles: [
         'addon/**',
         'addon-test-support/**',
         'app/**',
         'tests/dummy/app/**',
-        'node-tests/**/*',
-        'tests/unit/mocha/test-loader-test.js',
       ],
       parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
       },
       env: {
         browser: false,
         node: true
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
+      extends: ['plugin:node/recommended']
     },
-
     {
       files: [
-        "node-tests/**/*"
+        'node-tests/**/*',
+      ],
+      excludedFiles: [
+        'testem.multiple-test-page.js'
       ],
       parserOptions: {
-        ecmaVersion: 2017,
+        ecmaVersion: 2018,
       },
       env: {
         node: true,
         mocha: true,
       },
       rules: {
-      },
+      }
     }
   ]
 };

.travis.yml

@@ -1,63 +1,73 @@
 ---
 language: node_js
 node_js:
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
   - "10"
 
+dist: xenial
+
 addons:
   chrome: stable
 
 cache:
   yarn: true
 
+env:
+  global:
+    # 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:
-    - env: EMBER_TRY_SCENARIO=ember-canary TEST_FRAMEWORK=ember-qunit
-    - env: EMBER_TRY_SCENARIO=ember-canary TEST_FRAMEWORK=ember-mocha
+    - env: EMBER_TRY_SCENARIO=ember-canary
 
   include:
     # runs linting and tests with current locked deps
 
     - stage: "Tests"
       name: "Tests"
-      install:
-        - yarn install --non-interactive
-        - ./bin/install-test-framework.sh
       script:
-        - yarn lint:js
-        - yarn test:all
+        - yarn lint
+        - yarn test:ember
 
-    - name: "Floating Dependencies"
+    - stage: "Additional Tests"
+      name: "Floating Dependencies"
+      install:
+        - yarn install --no-lockfile --non-interactive
       script:
-        - yarn test:all
+        - yarn test:ember
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-2.16 TEST_FRAMEWORK=ember-qunit
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.16 TEST_FRAMEWORK=ember-mocha
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.18 TEST_FRAMEWORK=ember-qunit
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.18 TEST_FRAMEWORK=ember-mocha
-    - env: EMBER_TRY_SCENARIO=ember-release TEST_FRAMEWORK=ember-qunit
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
+    - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-release TEST_FRAMEWORK=ember-mocha
-    - env: EMBER_TRY_SCENARIO=ember-beta TEST_FRAMEWORK=ember-qunit
-    - env: EMBER_TRY_SCENARIO=ember-beta TEST_FRAMEWORK=ember-mocha
-    - env: EMBER_TRY_SCENARIO=ember-canary TEST_FRAMEWORK=ember-qunit
-    - env: EMBER_TRY_SCENARIO=ember-canary TEST_FRAMEWORK=ember-mocha
-    - env: EMBER_TRY_SCENARIO=ember-default-with-jquery TEST_FRAMEWORK=ember-qunit
-    - env: EMBER_TRY_SCENARIO=ember-default-with-jquery TEST_FRAMEWORK=ember-mocha
+    - env: EMBER_TRY_SCENARIO=ember-beta
+    - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=ember-classic
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
 
-after_success:
-  - if [[ ($TRAVIS_BRANCH == master || -n $TRAVIS_TAG) && $EMBER_TRY_SCENARIO == ember-default ]]; then
-    node_modules/.bin/ember deploy production;
-    fi
-
 install:
-  - yarn install --no-lockfile --non-interactive
+  - yarn install --non-interactive
 
 script:
+  - TEST_FRAMEWORK=$TEST_FRAMEWORK bin/install-test-framework.sh
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
+
+after_success:
+  - if [[ ($TRAVIS_BRANCH == master || -n $TRAVIS_TAG) && $EMBER_TRY_SCENARIO == ember-default ]]; then
+    node_modules/.bin/ember deploy production;
+    fi

bin/install-test-framework.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -ev
 if [ "${TEST_FRAMEWORK}" = "ember-mocha" ]; then
-  yarn remove ember-qunit
-  echo "n" | ember install ember-mocha@0.16.0 @ember/jquery && ember feature:enable jquery-integration
+  yarn remove ember-qunit 2>/dev/null && echo "n" | ember install ember-mocha || true
 fi

config/ember-try.js

@@ -13,84 +13,79 @@ const command = [
   process.env.TRAVIS_PULL_REQUEST
 ].filter(Boolean).join(' ');
 
-module.exports = function() {
-  return Promise.all([
-    getChannelURL('release'),
-    getChannelURL('beta'),
-    getChannelURL('canary')
-  ]).then((urls) => {
-    return {
-      command,
-      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'
-            }
+module.exports = async function() {
+  return {
+    command,
+    useYarn: true,
+    scenarios: [
+      {
+        name: 'ember-lts-3.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.12.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'
-            }
+        }
+      },
+      {
+        name: 'ember-lts-3.16',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.16.0'
           }
-        },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0]
-            }
+        }
+      },
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release')
           }
-        },
-        {
-          name: 'ember-beta',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[1]
-            }
+        }
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta')
           }
-        },
-        {
-          name: 'ember-canary',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[2]
-            }
+        }
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary')
           }
+        }
+      },
+      {
+        name: 'ember-default-with-jquery',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'jquery-integration': true
+          })
         },
-        {
-          name: 'ember-default',
-          npm: {
-            devDependencies: {}
+        npm: {
+          devDependencies: {
+            '@ember/jquery': '^0.5.1'
           }
+        }
+      },
+      {
+        name: 'ember-classic',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'application-template-wrapper': true,
+            'default-async-observers': false,
+            'template-only-glimmer-components': false
+          })
         },
-        {
-          name: 'ember-default-with-jquery',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({
-              'jquery-integration': true
-            })
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1'
-            }
+        npm: {
+          ember: {
+            edition: 'classic'
           }
         }
-      ]
-    };
-  });
+      }
+    ]
+  };
 };

node-tests/fixtures/test-helper-with-load.js

@@ -1,5 +1,3 @@
-/* globals require */
-
 import { setResolver } from '@ember/test-helpers';
 import resolver from './helpers/resolver';
 import loadEmberExam from 'ember-exam/test-support/load';