Skip to content

Commit e7c3cdb

Browse files
committed
Fingerprint test-support.js file
1 parent 092c9e6 commit e7c3cdb

4 files changed

Lines changed: 16 additions & 2 deletions

File tree

app/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929

3030
{{content-for 'body-footer'}}
3131

32+
<script>
33+
window.assetMap = {
34+
testSupport: "{{rootURL}}assets/test-support.js"
35+
};
36+
</script>
37+
3238
<script>
3339
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
3440
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

app/services/ember-cli.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,12 +310,14 @@ export default Ember.Service.extend({
310310
const testingEnabled = twiddleJSON.options && twiddleJSON.options["enable-testing"];
311311

312312
if (testingEnabled) {
313-
const testJSFiles = ['assets/test-loader.js', 'assets/test-support.js', 'testem.js'];
313+
const testJSFiles = ['assets/test-loader.js', 'testem.js'];
314314

315315
testJSFiles.forEach(jsFile => {
316316
depScriptTags += `<script type="text/javascript" src="${config.assetsHost}${jsFile}?${config.APP.version}"></script>`;
317317
});
318318

319+
depScriptTags += `<script type="text/javascript" src="${window.assetMap.testSupport}"></script>`;
320+
319321
depCssLinkTags += `<link rel="stylesheet" type="text/css" href="${config.assetsHost}assets/test-support.css?${config.APP.version}">`;
320322

321323
testStuff += `

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = function(defaults) {
2828
enabled: isProductionLikeBuild,
2929
prepend: prepend,
3030
extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'eot', 'ttf', 'woff', 'woff2', 'ico'],
31-
exclude: ['test-loader', 'test-support', 'testem']
31+
exclude: ['test-loader', 'test-support.css', 'testem']
3232
},
3333
codemirror: {
3434
modes: ['xml', 'javascript', 'handlebars', 'htmlmixed', 'css'],

tests/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
<script src="{{rootURL}}assets/ember-twiddle.js"></script>
3131
<script src="{{rootURL}}assets/tests.js"></script>
3232

33+
<script>
34+
window.assetMap = {
35+
testSupport: "{{rootURL}}assets/test-support.js"
36+
};
37+
</script>
38+
3339
{{content-for "body-footer"}}
3440
{{content-for "test-body-footer"}}
3541
</body>

0 commit comments

Comments
 (0)