Merge pull request #1203 from emberjs/ensure-integration-tests-work

tests/helpers/setup-destroy-ei-app.js

@@ -1,6 +1,7 @@
 import Application from '@ember/application';
 import EmberRouter from '@ember/routing/router';
 import {
+  getApplication,
   setApplication,
   setupApplicationContext,
   setupContext,
@@ -10,7 +11,6 @@ import {
 import { assert } from '@ember/debug';
 import { run } from '@ember/runloop';
 
-
 export async function setupEIApp(EmberDebug, routes) {
   assert('setupEIApp requires `EmberDebug` to be passed.', EmberDebug !== undefined);
 
@@ -28,6 +28,7 @@ export async function setupEIApp(EmberDebug, routes) {
   });
   App.register('router:main', Router);
 
+  this._originalApp = getApplication();
   await setApplication(App);
   await setupContext(this);
   await setupApplicationContext(this);
@@ -50,5 +51,8 @@ export async function destroyEIApp(EmberDebug, App) {
   EmberDebug.destroyContainer();
   await teardownApplicationContext(this);
   await teardownContext(this);
-  return run(App, 'destroy');
+
+  run(App, 'destroy');
+
+  setApplication(this._originalApp);
 }

tests/integration/components/basic-test.js

@@ -0,0 +1,14 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | basic', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('generally works', async function(assert) {
+    await render(hbs`Hello world!`);
+
+    assert.equal(this.element.textContent.trim(), 'Hello world!');
+  });
+});