Update Dependencies

.eslintignore

@@ -7,7 +7,6 @@
 /tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
@@ -16,5 +15,5 @@
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
+/bower.json.ember-try/
 /package.json.ember-try

.eslintrc.js

@@ -49,8 +49,8 @@ module.exports = {
       rules: {
         // the TypeScript compiler already takes care of this and
         // leaving it enabled results in false positives for interface imports
-        'no-unused-vars': false,
-        'no-undef': false,
+        'no-unused-vars': 0,
+        'no-undef': 0,
       },
     },
     {

.gitignore

@@ -1,24 +1,23 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
+/dist/
+/tmp/
 
 # dependencies
-/node_modules
-/bower_components
+/node_modules/
+/bower_components/
 
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-.eslintcache
-npm-debug.log*
-yarn-error.log
-testem.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.npmignore

@@ -1,42 +1,29 @@
 # compiled output
-/dist
-/docs
-/tmp
-
-# dependencies
-/node_modules
-/bower_components
+/dist/
+/tmp/
 
 # misc
-/.sass-cache
-/connect.lock
-/coverage/*
-/libpeerconnection.log
-npm-debug.log*
-yarn-error.log
-testem.log
-/tests
-**/.gitkeep
-.bowerrc
-.editorconfig
-.ember-cli
-.eslintrc.js
-.gitignore
-.watchmanconfig
-.travis.yml
-bower.json
-ember-cli-build.js
-testem.js
-yarn.lock
+/.editorconfig
+/.ember-cli
+/.eslintignore
+/.eslintrc.js
+/.gitignore
+/.template-lintrc.js
+/.travis.yml
+/.watchmanconfig
+/config/ember-try.js
+/ember-cli-build.js
+/testem.js
+/tests/
+/yarn.lock
+.gitkeep
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
-/config/ember-try.js
+/.node_modules.ember-try/
+/package.json.ember-try
 
 # typescript
 #
 # avoid publishing .d.ts or .ts files
 # until they have become enforced "public" APIs
-*.ts
+*.ts

.travis.yml

@@ -24,6 +24,11 @@ stages:
   - older version tests
   - deploy
 
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
 jobs:
   fail_fast: true
   allow_failures:
@@ -47,6 +52,8 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-lts-2.8
     - env: EMBER_TRY_SCENARIO=ember-lts-2.12
     - env: EMBER_TRY_SCENARIO=ember-lts-2.16
+    - env: EMBER_TRY_SCENARIO=ember-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
@@ -76,4 +83,6 @@ install:
   - yarn install
 
 script:
+  # 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

config/ember-try.js

@@ -8,6 +8,10 @@ module.exports = function() {
     getChannelURL('beta'),
     getChannelURL('canary'),
   ]).then(urls => {
+    let envWithoutJQuery = {
+      EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': false }),
+    };
+
     return {
       useYarn: true,
       scenarios: [
@@ -22,6 +26,7 @@ module.exports = function() {
             devDependencies: {
               'ember-source': null,
               'ember-fetch': null,
+              'ember-data': '~3.1.0',
             },
           },
         },
@@ -63,22 +68,44 @@ module.exports = function() {
           name: 'ember-lts-2.12',
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.2',
               'ember-source': '~2.12.0',
               'ember-fetch': null,
             },
           },
         },
         {
           name: 'ember-lts-2.16',
+          env: envWithoutJQuery,
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.16.0',
+              'ember-native-dom-event-dispatcher': '^0.6.4',
+            },
+          },
+        },
+        {
+          name: 'ember-2.18',
+          env: envWithoutJQuery,
           npm: {
             devDependencies: {
-              'ember-source': '~2.16.0-beta.1',
+              'ember-source': '~2.18.0',
               'ember-native-dom-event-dispatcher': '^0.6.4',
             },
           },
         },
+        {
+          name: 'ember-lts-3.4',
+          env: envWithoutJQuery,
+          npm: {
+            devDependencies: {
+              'ember-source': '~3.4.0',
+            },
+          },
+        },
         {
           name: 'ember-release',
+          env: envWithoutJQuery,
           npm: {
             devDependencies: {
               'ember-source': urls[0],
@@ -87,6 +114,7 @@ module.exports = function() {
         },
         {
           name: 'ember-beta',
+          env: envWithoutJQuery,
           npm: {
             devDependencies: {
               'ember-source': urls[1],
@@ -95,6 +123,7 @@ module.exports = function() {
         },
         {
           name: 'ember-canary',
+          env: envWithoutJQuery,
           npm: {
             devDependencies: {
               'ember-source': urls[2],
@@ -103,9 +132,9 @@ module.exports = function() {
         },
         {
           name: 'ember-without-application-wrapper',
-          env: {
+          env: Object.assign({}, envWithoutJQuery, {
             EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'application-template-wrapper': false }),
-          },
+          }),
           npm: {
             devDependencies: {
               'ember-source': urls[2],
@@ -114,6 +143,9 @@ module.exports = function() {
         },
         {
           name: 'ember-default-with-jquery',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+          },
           npm: {
             devDependencies: {
               'ember-fetch': null,
@@ -122,6 +154,7 @@ module.exports = function() {
         },
         {
           name: 'ember-default',
+          env: envWithoutJQuery,
           npm: {
             devDependencies: {},
           },

index.js

@@ -4,7 +4,7 @@ const BroccoliDebug = require('broccoli-debug');
 const debugTree = BroccoliDebug.buildDebugCallback('ember-test-helpers');
 
 module.exports = {
-  name: 'ember-test-helpers',
+  name: require('./package').name,
 
   init() {
     this._super.init && this._super.init.apply(this, arguments);

package.json

@@ -5,11 +5,12 @@
   "keywords": [
     "ember-addon"
   ],
+  "repository": "https://github.com/emberjs/ember-test-helpers",
+  "license": "(MIT OR Apache-2.0)",
   "homepage": "https://github.com/emberjs/ember-test-helpers#readme",
   "bugs": {
     "url": "https://github.com/emberjs/ember-test-helpers/issues"
   },
-  "license": "(MIT OR Apache-2.0)",
   "contributors": [
     "Dan Gebhardt",
     "Robert Jackson",
@@ -21,7 +22,6 @@
     "doc": "doc",
     "test": "tests"
   },
-  "repository": "https://github.com/emberjs/ember-test-helpers",
   "scripts": {
     "build": "ember build",
     "changelog": "lerna-changelog",
@@ -48,33 +48,33 @@
     "@types/rsvp": "^4.0.2",
     "broccoli-merge-trees": "^3.0.1",
     "documentation": "8.1.2",
-    "ember-cli": "~3.1.2",
+    "ember-cli": "~3.5.0",
     "ember-cli-dependency-checker": "^3.0.0",
-    "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^3.0.1",
     "ember-cli-inject-live-reload": "^2.0.1",
     "ember-cli-pretender": "^3.0.0",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-test-loader": "^2.2.0",
     "ember-cli-typescript": "^1.5.0",
-    "ember-data": "3.1.1",
+    "ember-data": "~3.5.0",
     "ember-debug-handlers-polyfill": "^1.0.3",
-    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-disable-prototype-extensions": "^1.1.3",
     "ember-fetch": "^6.1.0",
     "ember-load-initializers": "^2.0.0",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.1.0",
-    "ember-source-channel-url": "^1.0.1",
-    "ember-try": "1.1.0",
+    "ember-source": "~3.5.0",
+    "ember-source-channel-url": "^1.1.0",
+    "ember-try": "^1.1.0",
+    "eslint": "^5.8.0",
     "eslint-config-prettier": "^3.1.0",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-prettier": "^3.0.0",
     "eslint-plugin-typescript": "^0.13.0",
     "fs-extra": "^7.0.0",
     "lerna-changelog": "^0.8.2",
-    "loader.js": "^4.2.3",
+    "loader.js": "^4.7.0",
     "prettier": "^1.15.1",
     "qunit": "^2.8.0",
     "typescript": "^3.1.6",

testem.js

@@ -6,20 +6,20 @@ module.exports = {
   launch_in_dev: ['Chrome', 'Firefox'],
   browser_args: {
     Chrome: {
-      mode: 'ci',
-      args: [
+      ci: [
         // --no-sandbox is needed when running Chrome inside a container
-        process.env.TRAVIS ? '--no-sandbox' : null,
-
-        '--disable-gpu',
+        process.env.CI ? '--no-sandbox' : null,
         '--headless',
+        '--disable-gpu',
+        '--disable-dev-shm-usage',
+        '--disable-software-rasterizer',
+        '--mute-audio',
         '--remote-debugging-port=0',
         '--window-size=1440,900',
       ].filter(Boolean),
     },
     Firefox: {
-      mode: 'ci',
-      args: ['-headless'],
+      ci: ['-headless'],
     },
   },
 };

tests/unit/teardown-context-test.js

@@ -1,12 +1,6 @@
 import { module, test } from 'qunit';
 import Service from '@ember/service';
-import {
-  getContext,
-  setupContext,
-  teardownContext,
-  isSettled,
-  getSettledState,
-} from '@ember/test-helpers';
+import { getContext, setupContext, teardownContext, getSettledState } from '@ember/test-helpers';
 import { setResolverRegistry } from '../helpers/resolver';
 import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import Ember from 'ember';
@@ -70,10 +64,9 @@ module('teardownContext', function(hooks) {
 
       await teardownContext(context);
 
-      assert.ok(
-        isSettled(),
-        `out of balance xhr semaphores are cleaned up on teardown: ${getSettledState()}`
-      );
+      let state = getSettledState();
+      assert.equal(state.hasPendingRequests, false, 'hasPendingRequests is false');
+      assert.equal(state.pendingRequestCount, 0, 'pendingRequestCount is 0');
     });
   }
 });

types/dummy/index.d.ts

@@ -1 +0,0 @@
-