Skip to content

Commit 63b8eb0

Browse files
committed
Fix ember-testing issue in canary
1 parent 7590a03 commit 63b8eb0

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ module.exports = function(defaults) {
102102
app.import('vendor/ember/ember-template-compiler.js');
103103
app.import('vendor/ember/ember-testing.js', {
104104
type: 'vendor',
105-
outputFile: 'ember-testing.js'
105+
outputFile: 'ember-local-testing.js'
106106
});
107107
app.import('vendor/shims/babel.js');
108108
app.import('vendor/shims/path.js');

tests/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script src="{{rootURL}}testem.js" integrity=""></script>
2828
<script src="{{rootURL}}assets/vendor.js"></script>
29-
<script src="{{rootURL}}assets/ember-testing.js"></script>
29+
<script src="{{rootURL}}assets/ember-local-testing.js"></script>
3030
<script src="{{rootURL}}assets/test-support.js"></script>
3131
<script src="{{rootURL}}assets/ember-twiddle.js"></script>
3232
<script src="{{rootURL}}assets/tests.js"></script>

0 commit comments

Comments
 (0)