Fix ember-testing issue in canary

ember-cli · Oct 1, 2018 · 63b8eb0 · 63b8eb0
1 parent 7590a03
commit 63b8eb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -102,7 +102,7 @@ module.exports = function(defaults) {
   app.import('vendor/ember/ember-template-compiler.js');
   app.import('vendor/ember/ember-testing.js', {
     type: 'vendor',
-    outputFile: 'ember-testing.js'
+    outputFile: 'ember-local-testing.js'
   });
   app.import('vendor/shims/babel.js');
   app.import('vendor/shims/path.js');

diff --git a/tests/index.html b/tests/index.html
@@ -26,7 +26,7 @@
 
     <script src="{{rootURL}}testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/ember-testing.js"></script>
+    <script src="{{rootURL}}assets/ember-local-testing.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/ember-twiddle.js"></script>
     <script src="{{rootURL}}assets/tests.js"></script>