Upgrade QUnit to 2.0

package.json

@@ -34,13 +34,14 @@
  "ember-cli-version-checker": "^1.1.4",
  "ember-qunit": "^0.4.18",
  "qunit-notifications": "^0.1.1",
- "qunitjs": "^1.20.0",
+ "qunitjs": "^2.0.1",
  "resolve": "^1.1.6",
  "rsvp": "^3.2.1"
  },
  "devDependencies": {
  "ember-cli": "^2.4.2",
  "ember-cli-htmlbars": "^1.0.3",
+ "ember-load-initializers": "^0.5.1",
  "ember-resolver": "^2.0.3",
  "ember-try": "^0.2.2",
  "loader.js": "^4.0.1"

tests/acceptance/adatper-test.js

@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
+import { test } from 'qunit';
+
+moduleForAcceptance('Adapter Acceptance');
+
+test('Async behavior', function(assert) {
+ assert.expect(2);
+
+ visit('/');
+ andThen(() => assert.ok(true));
+});

vendor/ember-cli-qunit/test-loader.js

@@ -1,6 +1,20 @@
 /* globals jQuery, QUnit, require, requirejs */
 
 jQuery(document).ready(function() {
+ Ember.Test.QUnit2Adapter = Ember.Test.QUnitAdapter.extend({
+ init() {
+ this.doneCallbacks = [];
+ },
+ asyncStart() {
+ this.doneCallbacks.push(QUnit.config.current.assert.async());
+ },
+ asyncEnd() {
+ this.doneCallbacks.pop()();
+ }
+ });
+
+ Ember.Test.adapter = Ember.Test.QUnit2Adapter.create();
+
  var testLoaderModulePath = 'ember-cli-test-loader/test-support/index';
 
  if (!requirejs.entries[testLoaderModulePath]) {