From a40849e676c4f95385548489b9a930b84e7e96cd Mon Sep 17 00:00:00 2001
From: Robert Jackson <rwjblue@twitch.tv>
Date: Sat, 3 Sep 2016 17:06:24 -0400
Subject: [PATCH] Fix Ember._Renderer export issue.

* Update tests to ensure that the global path must not be `undefined`
* Fix issue with `Ember._Renderer` export
* Remove `Ember.rewatch` export remnants (it was removed in https://github.com/emberjs/ember.js/pull/9323)
* Remove `Ember.apply` export remnants (it was removed in https://github.com/emberjs/ember.js/pull/13655)
* Remove `Ember.tryCatchFinally` export remnants (it was removed in https://github.com/emberjs/ember.js/pull/11547)
---
 packages/ember-glimmer/lib/index.js         | 6 +++++-
 packages/ember-metal/lib/index.js           | 2 --
 packages/ember/lib/index.js                 | 6 ++----
 packages/ember/tests/reexports_test.js      | 5 +----
 packages/internal-test-helpers/lib/index.js | 8 +++++++-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/ember-glimmer/lib/index.js b/packages/ember-glimmer/lib/index.js
index c88da0f543f..c176c6faffc 100644
--- a/packages/ember-glimmer/lib/index.js
+++ b/packages/ember-glimmer/lib/index.js
@@ -17,7 +17,11 @@ export {
   isHTMLSafe,
   getSafeString as _getSafeString
 } from './utils/string';
-export { default as _Renderer } from './renderer';
+export {
+  Renderer,
+  InertRenderer,
+  InteractiveRenderer
+} from './renderer';
 export {
   getTemplate,
   setTemplate,
diff --git a/packages/ember-metal/lib/index.js b/packages/ember-metal/lib/index.js
index 98b41010b18..4b331c58541 100644
--- a/packages/ember-metal/lib/index.js
+++ b/packages/ember-metal/lib/index.js
@@ -31,14 +31,12 @@ export {
   intern,
   GUID_KEY,
   GUID_KEY_PROPERTY,
-  apply,
   applyStr,
   canInvoke,
   generateGuid,
   guidFor,
   inspect,
   makeArray,
-  deprecatedTryCatchFinally,
   tryInvoke,
   uuid,
   wrap
diff --git a/packages/ember/lib/index.js b/packages/ember/lib/index.js
index f4b46fb1722..80f6f5e22c8 100644
--- a/packages/ember/lib/index.js
+++ b/packages/ember/lib/index.js
@@ -44,12 +44,10 @@ Ember.GUID_KEY = metal.GUID_KEY;
 Ember.guidFor = metal.guidFor;
 Ember.inspect = metal.inspect;
 
-Ember.tryCatchFinally = metal.deprecatedTryCatchFinally;
 Ember.makeArray = metal.makeArray;
 Ember.canInvoke = metal.canInvoke;
 Ember.tryInvoke = metal.tryInvoke;
 Ember.wrap = metal.wrap;
-Ember.apply = metal.apply;
 Ember.applyStr = metal.applyStr;
 Ember.uuid = metal.uuid;
 Ember.Error = metal.Error;
@@ -469,7 +467,7 @@ import {
   getTemplates,
   setTemplates,
   _getSafeString,
-  _Renderer
+  Renderer
 } from 'ember-glimmer';
 
 Ember.Component = Component;
@@ -479,7 +477,7 @@ Ember.Checkbox = Checkbox;
 Ember.TextField = TextField;
 Ember.TextArea = TextArea;
 Ember.LinkComponent = LinkComponent;
-Ember._Renderer = _Renderer;
+Ember._Renderer = Renderer;
 
 if (ENV.EXTEND_PROTOTYPES.String) {
   String.prototype.htmlSafe = function() {
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index f181af05bce..8e4faeeafaf 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -36,12 +36,10 @@ QUnit.module('ember reexports');
   ['GUID_KEY', 'ember-metal'],
   ['guidFor', 'ember-metal'],
   ['inspect', 'ember-metal'],
-  ['tryCatchFinally', 'ember-metal', 'deprecatedTryCatchFinally'],
   ['makeArray', 'ember-metal'],
   ['canInvoke', 'ember-metal'],
   ['tryInvoke', 'ember-metal'],
   ['wrap', 'ember-metal'],
-  ['apply', 'ember-metal'],
   ['applyStr', 'ember-metal'],
   ['uuid', 'ember-metal'],
   ['testing', 'ember-metal', { get: 'isTesting', set: 'setTesting' }],
@@ -94,7 +92,6 @@ QUnit.module('ember reexports');
   ['watch', 'ember-metal'],
   ['isWatching', 'ember-metal'],
   ['unwatch', 'ember-metal'],
-  ['rewatch', 'ember-metal'],
   ['destroy', 'ember-metal'],
   ['libraries', 'ember-metal'],
   ['OrderedSet', 'ember-metal'],
@@ -132,7 +129,7 @@ QUnit.module('ember reexports');
   ['EventDispatcher', 'ember-views'],
 
   // ember-glimmer
-  ['_Renderer',     'ember-glimmer', '_Renderer'],
+  ['_Renderer',     'ember-glimmer', 'Renderer'],
   ['Component',     'ember-glimmer', 'Component'],
   ['Helper',        'ember-glimmer', 'Helper'],
   ['Helper.helper', 'ember-glimmer', 'helper'],
diff --git a/packages/internal-test-helpers/lib/index.js b/packages/internal-test-helpers/lib/index.js
index 6a7243039d9..54f5cae7685 100644
--- a/packages/internal-test-helpers/lib/index.js
+++ b/packages/internal-test-helpers/lib/index.js
@@ -44,9 +44,15 @@ export function confirmExport(Ember, assert, path, moduleId, exportName) {
   let mod = require(moduleId);
   if (typeof exportName === 'string') {
     assert.equal(desc.value, mod[exportName], `Ember.${path} is exported correctly`);
+    assert.notEqual(mod[exportName], undefined, `Ember.${path} is not \`undefined\``);
   } else {
     assert.equal(desc.get, mod[exportName.get], `Ember.${path} getter is exported correctly`);
-    assert.equal(desc.set, mod[exportName.set], `Ember.${path} setter is exported correctly`);
+    assert.notEqual(desc.get, undefined, `Ember.${path} getter is not undefined`);
+
+    if (exportName.set) {
+      assert.equal(desc.set, mod[exportName.set], `Ember.${path} setter is exported correctly`);
+      assert.notEqual(desc.set, undefined, `Ember.${path} setter is not undefined`);
+    }
   }
 }