Skip to content

Commit

Permalink
Merge pull request #741 from emberjs/make-ember-testing-container-exp…
Browse files Browse the repository at this point in the history
…licit
  • Loading branch information
rwjblue authored Aug 17, 2020
2 parents 72b0cf6 + 4bca327 commit 316db5c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 18 deletions.
17 changes: 0 additions & 17 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,6 @@ module.exports = {
return this._targetOptions;
},

contentFor: function (type) {
// Skip if insertContentForTestBody === false.
if (
type === 'test-body' &&
!(this.targetOptions().insertContentForTestBody === false)
) {
return stripIndent`
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<div id="ember-testing-container">
<div id="ember-testing"></div>
</div>
`;
}
},

treeForVendor: function (tree) {
const MergeTrees = require('broccoli-merge-trees');
const Funnel = require('broccoli-funnel');
Expand Down
9 changes: 8 additions & 1 deletion tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@
</head>
<body>
{{content-for "body"}}
{{content-for "test-body"}}

<div id="qunit"></div>
<div id="qunit-fixture">
<div id="ember-testing-container">
<div id="ember-testing"></div>
</div>
</div>


<script src="/testem.js" integrity=""></script>
<script src="{{rootURL}}assets/vendor.js"></script>
Expand Down

0 comments on commit 316db5c

Please sign in to comment.