Merge pull request #15242 from Serabe/fix/15237

[BUGFIX release] Fix EmberError import in system/router
emberjs · May 13, 2017 · d439350 · d439350
2 parents b02f99d + 47e56f8
commit d439350
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
@@ -14,7 +14,7 @@ import {
   deprecateProperty
 } from 'ember-metal';
 import {
-  EmberError,
+  Error as EmberError,
   deprecate,
   assert,
   info

diff --git a/packages/ember-routing/tests/system/router_test.js b/packages/ember-routing/tests/system/router_test.js
@@ -45,6 +45,13 @@ QUnit.test('can create a router without an owner', function() {
   ok(true, 'no errors were thrown when creating without a container');
 });
 
+QUnit.test('[GH#15237] EmberError is imported correctly', function() {
+  // If we get the right message it means Error is being imported correctly.
+  throws(function() {
+    triggerEvent(null, false, []);
+  }, /because your app hasn't finished transitioning/);
+});
+
 QUnit.test('should not create a router.js instance upon init', function() {
   let router = createRouter(null, { disableSetup: true });