Merge pull request #351 from Turbo87/tests

Use new `ember-qunit` testing APIs

package.json

@@ -45,8 +45,9 @@
     "ember-cli-htmlbars": "^3.0.0",
     "ember-cli-htmlbars-inline-precompile": "^2.0.0",
     "ember-cli-inject-live-reload": "^2.0.1",
-    "ember-cli-qunit": "^4.0.0",
     "ember-load-initializers": "^2.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^4.4.1",
     "ember-resolver": "^5.1.3",
     "ember-source": "~3.9.1",
     "eslint": "^5.16.0",

tests/acceptance/qunit-dom-test.js

@@ -1,22 +1,20 @@
-/* eslint-env embertest */
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import { visit } from '@ember/test-helpers';
 
-import { test } from 'qunit';
-import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
+module('Acceptance | qunit-dom', function(hooks) {
+  setupApplicationTest(hooks);
 
-moduleForAcceptance('Acceptance | qunit-dom');
+  test('qunit-dom assertions are available', async function(assert) {
+    assert.ok(assert.dom, 'assert.dom is available');
+    assert.ok(assert.dom('.foo').includesText, 'assert.dom(...).includesText is available');
 
-test('qunit-dom assertions are available', function(assert) {
-  assert.expect(15);
+    assert.dom('#qunit').doesNotExist('rootElement is set to #ember-testing-container');
 
-  assert.ok(assert.dom, 'assert.dom is available');
-  assert.ok(assert.dom('.foo').includesText, 'assert.dom(...).includesText is available');
+    assert.dom().hasAttribute('id', 'ember-testing');
 
-  assert.dom('#qunit').doesNotExist('rootElement is set to #ember-testing-container');
+    await visit('/');
 
-  assert.dom().hasAttribute('id', 'ember-testing');
-
-  visit('/');
-  andThen(() => {
     assert.dom('#title').exists();
     assert.dom('#subtitle').doesNotExist();
     assert.dom('#title').hasText('Welcome to Ember');

tests/dummy/config/environment.js

@@ -41,6 +41,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {

tests/test-helper.js

@@ -1,6 +1,8 @@
-import resolver from './helpers/resolver';
-import { setResolver } from '@ember/test-helpers';
-import { start } from 'ember-cli-qunit';
+import Application from '../app';
+import config from '../config/environment';
+import { setApplication } from '@ember/test-helpers';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create(config.APP));
 
-setResolver(resolver);
 start();