Create shared qunit-fixture setup functionality.

emberjs · Dec 22, 2017 · 9bc6697 · 9bc6697
1 parent 8ded2c0
commit 9bc6697
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/packages/ember-application/tests/system/application_test.js b/packages/ember-application/tests/system/application_test.js
@@ -212,7 +212,8 @@ moduleFor('Ember.Application, default resolver with autoboot', class extends Def
   }
 
   [`@test Minimal Application initialized with just an application template`]() {
-    jQuery('#qunit-fixture').html('<script type="text/x-handlebars">Hello World</script>');
+    this.setupFixture('<script type="text/x-handlebars">Hello World</script>');
+
     this.runTask(() => this.createApplication());
     this.assertInnerHTML('Hello World');
   }

diff --git a/packages/ember-application/tests/system/bootstrap-test.js b/packages/ember-application/tests/system/bootstrap-test.js
@@ -1,19 +1,17 @@
 import { assign } from 'ember-utils';
-import { jQuery } from 'ember-views';
 import {
   moduleFor,
   DefaultResolverApplicationTestCase
 } from 'internal-test-helpers';
 
 moduleFor('Ember.Application with default resolver and autoboot', class extends DefaultResolverApplicationTestCase {
-  constructor() {
-    jQuery('#qunit-fixture').html(`
+  get fixture() {
+    return `
       <div id="app"></div>
 
       <script type="text/x-handlebars">Hello {{outlet}}</script>
       <script type="text/x-handlebars" id="index">World!</script>
-    `);
-    super();
+    `;
   }
 
   get applicationOptions() {

diff --git a/packages/internal-test-helpers/lib/test-cases/abstract.js b/packages/internal-test-helpers/lib/test-cases/abstract.js
@@ -31,6 +31,11 @@ export default class AbstractTestCase {
     this.element = null;
     this.snapshot = null;
     this.assert = QUnit.config.current.assert;
+
+    let { fixture } = this;
+    if (fixture) {
+      this.setupFixture(fixture);
+    }
   }
 
   teardown() {}
@@ -43,6 +48,11 @@ export default class AbstractTestCase {
     return run.next(callback);
   }
 
+  setupFixture(innerHTML) {
+    let fixture = document.querySelector('#qunit-fixture');
+    fixture.innerHTML = innerHTML;
+  }
+
   // The following methods require `this.element` to work
 
   get firstChild() {