Add failing test around moduleName mutation

.travis.yml

@@ -4,7 +4,7 @@ dist: trusty
 
 node_js:
   - "5"
-  
+
 cache:
   directories:
     - node_modules
@@ -23,12 +23,6 @@ install:
 after_success:
   - "./bin/publish_builds"
 
-branches:
-  only:
-    - master
-    - beta
-    - stable
-
 env:
   global:
     - SAUCE_USERNAME=ember-ci

CHANGELOG.md

@@ -1,5 +1,55 @@
 # Ember Changelog
 
+### 2.8.0-beta.5 (August 30, 2016)
+
+- [#14159](https://github.com/emberjs/ember.js/pull/14159) [BUGFIX] Fix rendering system cleanup.
+
+### 2.8.0-beta.4 (August 29, 2016)
+
+- [#14123](https://github.com/emberjs/ember.js/pull/14123) [BUGFIX] Avoid rerendering outlet state during router destruction.
+- [#14077](https://github.com/emberjs/ember.js/pull/14077) [BUGFIX] Update route-recognizer.
+- [#14087](https://github.com/emberjs/ember.js/pull/14087) [BUGFIX] Check that route handler exists before triggering actions.
+- [#14106](https://github.com/emberjs/ember.js/pull/14106) [BUGFIX] Avoid assertion when `id=` is provided to tagless components.
+- [#14110](https://github.com/emberjs/ember.js/pull/14110) [BUGFIX] Fix issues with revalidation during teardown.
+- [#14117](https://github.com/emberjs/ember.js/pull/14117) [BUGFIX] Call ArrayProxy's content change hooks
+- [#14135](https://github.com/emberjs/ember.js/pull/14135) [BUGFIX] Fix issues around Engine setup and teardown.
+- [#14140](https://github.com/emberjs/ember.js/pull/14140) [BUGFIX] Ensure component injections happen in engine instances.
+
+
+### 2.8.0-beta.3 (August 15, 2016)
+
+- [#14009](https://github.com/emberjs/ember.js/pull/14009) [BUGFIX] Fix usage of `role` when used in `attributeBindings`.
+- [#14044](https://github.com/emberjs/ember.js/pull/14044) / [#14062](https://github.com/emberjs/ember.js/pull/14062) / [#14066](https://github.com/emberjs/ember.js/pull/14066) [BUGFIX] Update `router.js` so that `getHandlers` is invoked lazily.
+- [#14054](https://github.com/emberjs/ember.js/pull/14054) [BUGFIX] Ensure substates properly work with `resetNamespace`.
+- [#14033](https://github.com/emberjs/ember.js/pull/14033) [BUGFIX] Ensure `fillIn` acceptance test helper only sets value to first matched element.
+- [#14058](https://github.com/emberjs/ember.js/pull/14058) [BUGFIX] Fix issues related to `Ember.Router.map` changes in 2.7.0.
+- [#14068](https://github.com/emberjs/ember.js/pull/14068) [BUGFIX] Prevent errors when clicking a `{{link-to}}` during an existing transition.
+
+
+### 2.8.0-beta.2 (August 1, 2016)
+
+- [#13887](https://github.com/emberjs/ember.js/pull/13887) [BUGFIX] Add assertions for illegal component invocations.
+- [#13892](https://github.com/emberjs/ember.js/pull/13892) [CLEANUP] Remove `View#createElement` / `View#destroyElement`.
+- [#13895](https://github.com/emberjs/ember.js/pull/13895) [BUGFIX] Fix template meta lookup for nested tagless and blockless components.
+- [#13911](https://github.com/emberjs/ember.js/pull/13911) [BUGFIX] Avoid using clobbering `.env` property on components.
+- [#13913](https://github.com/emberjs/ember.js/pull/13913) [BUGFIX] Disallow paths beginning with @ in templates.
+- [#13920](https://github.com/emberjs/ember.js/pull/13920) [BUGFIX] Add more info to the `Ember.Binding` deprecation.
+
+### 2.8.0-beta.1 (July 25, 2016)
+
+- [#13757](https://github.com/emberjs/ember.js/pull/13757) / [#13773](https://github.com/emberjs/ember.js/pull/13773) [CLEANUP] Remove legacy view layer features.
+- [#13819](https://github.com/emberjs/ember.js/pull/13819) [DOC] Add documentation for container (getOwner, etc.)
+- [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-string-ishtmlsafe] Enable by defaut.
+- [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-application-engines] Enable by default.
+- [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-runtime-enumerable-includes] Enable by default.
+- [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-testing-check-waiters] Enable by default.
+
+### 2.7.1 (August 15, 2016)
+
+- [#13920](https://github.com/emberjs/ember.js/pull/13920) [BUGFIX] Add more info to the `Ember.Binding` deprecation.
+- [#14058](https://github.com/emberjs/ember.js/pull/14058) [BUGFIX] Fix issues related to `Ember.Router.map` changes in 2.7.0.
+- [#14068](https://github.com/emberjs/ember.js/pull/14068) [BUGFIX] Prevent errors when clicking a `{{link-to}}` during an existing transition.
+
 ### 2.7.0 (July 25, 2016)
 
 - [#13764](https://github.com/emberjs/ember.js/pull/13764) [BUGFIX] Keep rest positional parameters when nesting contextual components if needed.

VERSION

@@ -1 +1 @@
-2.7.0+canary
+2.8.0-beta.5

bin/bower_ember_build

@@ -59,7 +59,7 @@ git remote rm origin
 # Sending output to /dev/null to prevent GH_TOKEN leak on error.
 git remote add origin https://${USER}:${GH_TOKEN}@github.com/${COMPONENTS_EMBER_REPO_SLUG}.git &> /dev/null
 git add -A
-git commit -m "Ember Bower Auto build for https://github.com/emberjs/ember.js/commits/${TRAVIS_COMMIT}."
+git commit -m "Ember Bower Auto build for https://github.com/emberjs/ember.js/commit/${TRAVIS_COMMIT}."
 
 # Sending output to /dev/null to prevent GH_TOKEN leak on error.
 git push -fq origin ${CHANNEL} &> /dev/null

bower.json

@@ -12,7 +12,7 @@
   "devDependencies": {
     "backburner": "https://github.com/ebryn/backburner.js.git#b893c979cb38f9819f65561725907add1aed7b21",
     "rsvp": "https://github.com/tildeio/rsvp.js.git#3.0.20",
-    "router.js": "https://github.com/tildeio/router.js.git#7f2f7c16540570ad2c720f9bd9a7a55e4bcdc95c",
+    "router.js": "https://github.com/tildeio/router.js.git#55d8b781bd8c137d1f258ee51d8493d7342e9631",
     "dag-map": "https://github.com/krisselden/dag-map.git#1.0.2",
     "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c"
   }

features.json

@@ -1,15 +1,15 @@
 {
   "features": {
-    "features-stripped-test": null,
-    "ember-routing-route-configured-query-params": null,
-    "ember-libraries-isregistered": null,
+    "features-stripped-test": false,
+    "ember-routing-route-configured-query-params": false,
+    "ember-libraries-isregistered": false,
     "ember-application-engines": true,
-    "ember-glimmer": null,
+    "ember-glimmer": false,
     "ember-runtime-computed-uniq-by": true,
-    "ember-improved-instrumentation": null,
+    "ember-improved-instrumentation": false,
     "ember-runtime-enumerable-includes": true,
     "ember-string-ishtmlsafe": true,
     "ember-testing-check-waiters": true,
-    "ember-metal-weakmap": null
+    "ember-metal-weakmap": false
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ember",
   "license": "MIT",
-  "version": "2.7.0-canary",
+  "version": "2.8.0-beta.5",
   "keywords": [
     "ember-addon"
   ],
@@ -43,7 +43,7 @@
     "mocha": "^2.4.5",
     "qunit-extras": "^1.5.0",
     "qunitjs": "^1.22.0",
-    "route-recognizer": "0.2.0",
+    "route-recognizer": "^0.2.2",
     "rsvp": "~3.2.1",
     "serve-static": "^1.10.0",
     "simple-dom": "^0.3.0",

packages/ember-application/lib/system/application-instance.js

@@ -131,21 +131,7 @@ const ApplicationInstance = EngineInstance.extend({
   },
 
   setupRegistry(options) {
-    let registry = this.__registry__;
-
-    registry.register('-environment:main', options.toEnvironment(), { instantiate: false });
-    registry.injection('view', '_environment', '-environment:main');
-    registry.injection('route', '_environment', '-environment:main');
-
-    registry.register('service:-document', options.document, { instantiate: false });
-
-    if (options.isInteractive) {
-      registry.injection('view', 'renderer', 'renderer:-dom');
-      registry.injection('component', 'renderer', 'renderer:-dom');
-    } else {
-      registry.injection('view', 'renderer', 'renderer:-inert');
-      registry.injection('component', 'renderer', 'renderer:-inert');
-    }
+    this.constructor.setupRegistry(this.__registry__, options);
   },
 
   router: computed(function() {
@@ -288,6 +274,21 @@ const ApplicationInstance = EngineInstance.extend({
   }
 });
 
+ApplicationInstance.reopenClass({
+  /**
+   @private
+   @method setupRegistry
+   @param {Registry} registry
+   @param {BootOptions} options
+  */
+  setupRegistry(registry, options = new BootOptions()) {
+    registry.register('-environment:main', options.toEnvironment(), { instantiate: false });
+    registry.register('service:-document', options.document, { instantiate: false });
+
+    this._super(registry, options);
+  }
+});
+
 /**
   A list of boot-time configuration options for customizing the behavior of
   an `Ember.ApplicationInstance`.
@@ -474,6 +475,7 @@ BootOptions.prototype.toEnvironment = function() {
   let env = assign({}, environment);
   // For compatibility with existing code
   env.hasDOM = this.isBrowser;
+  env.isInteractive = this.isInteractive;
   env.options = this;
   return env;
 };

packages/ember-application/lib/system/application.js

@@ -4,6 +4,7 @@
 */
 import { ENV } from 'ember-environment';
 import { assert, debug } from 'ember-metal/debug';
+import dictionary from 'ember-metal/dictionary';
 import libraries from 'ember-metal/libraries';
 import { isTesting } from 'ember-metal/testing';
 import { get } from 'ember-metal/property_get';
@@ -1031,7 +1032,7 @@ Application.reopenClass({
 });
 
 function commonSetupRegistry(registry) {
-  registry.register('-view-registry:main', { create() { return {}; } });
+  registry.register('-view-registry:main', { create() { return dictionary(null); } });
 
   registry.register('route:basic', Route);
   registry.register('event_dispatcher:main', EventDispatcher);

packages/ember-application/lib/system/engine-instance.js

@@ -71,7 +71,7 @@ const EngineInstance = EmberObject.extend(RegistryProxy, ContainerProxy, {
     @param options {Object}
     @return {Promise<Ember.EngineInstance,Error>}
   */
-  boot(options = {}) {
+  boot(options) {
     if (this._bootPromise) { return this._bootPromise; }
 
     this._bootPromise = new RSVP.Promise(resolve => resolve(this._bootSync(options)));
@@ -102,13 +102,19 @@ const EngineInstance = EmberObject.extend(RegistryProxy, ContainerProxy, {
       this.cloneParentDependencies();
     }
 
+    this.setupRegistry(options);
+
     this.base.runInstanceInitializers(this);
 
     this._booted = true;
 
     return this;
   },
 
+  setupRegistry(options = this.__container__.lookup('-environment:main')) {
+    this.constructor.setupRegistry(this.__registry__, options);
+  },
+
   /**
    Unregister a factory.
 
@@ -133,6 +139,30 @@ const EngineInstance = EmberObject.extend(RegistryProxy, ContainerProxy, {
   }
 });
 
+EngineInstance.reopenClass({
+  /**
+   @private
+   @method setupRegistry
+   @param {Registry} registry
+   @param {BootOptions} options
+   */
+  setupRegistry(registry, options) {
+    // when no options/environment is present, do nothing
+    if (!options) { return; }
+
+    registry.injection('view', '_environment', '-environment:main');
+    registry.injection('route', '_environment', '-environment:main');
+
+    if (options.isInteractive) {
+      registry.injection('view', 'renderer', 'renderer:-dom');
+      registry.injection('component', 'renderer', 'renderer:-dom');
+    } else {
+      registry.injection('view', 'renderer', 'renderer:-inert');
+      registry.injection('component', 'renderer', 'renderer:-inert');
+    }
+  }
+});
+
 if (isEnabled('ember-application-engines')) {
   EngineInstance.reopen({
     /**
@@ -170,17 +200,32 @@ if (isEnabled('ember-application-engines')) {
     cloneParentDependencies() {
       let parent = getEngineParent(this);
 
-      [
+      let registrations = [
         'route:basic',
         'event_dispatcher:main',
         'service:-routing'
-      ].forEach(key => this.register(key, parent.resolveRegistration(key)));
+      ];
+
+      if (isEnabled('ember-glimmer')) {
+        registrations.push('service:-glimmer-environment');
+      }
+
+      registrations.forEach(key => this.register(key, parent.resolveRegistration(key)));
 
-      [
+      let env = parent.lookup('-environment:main');
+      this.register('-environment:main', env, { instantiate: false });
+
+      let singletons = [
         'router:main',
         P`-bucket-cache:main`,
-        '-view-registry:main'
-      ].forEach(key => this.register(key, parent.lookup(key), { instantiate: false }));
+        '-view-registry:main',
+        `renderer:-${env.isInteractive ? 'dom' : 'inert'}`
+      ];
+
+      singletons.forEach(key => this.register(key, parent.lookup(key), { instantiate: false }));
+
+      this.inject('view', '_environment', '-environment:main');
+      this.inject('route', '_environment', '-environment:main');
     }
   });
 }

packages/ember-application/tests/system/application_instance_test.js

@@ -6,6 +6,7 @@ import jQuery from 'ember-views/system/jquery';
 import factory from 'container/tests/test-helpers/factory';
 import isEnabled from 'ember-metal/features';
 import { privatize as P } from 'container/registry';
+import EmberObject from 'ember-runtime/system/object';
 
 let application, appInstance;
 
@@ -140,7 +141,7 @@ QUnit.test('unregistering a factory clears all cached instances of that factory'
 
 if (isEnabled('ember-application-engines')) {
   QUnit.test('can build and boot a registered engine', function(assert) {
-    assert.expect(7);
+    assert.expect(isEnabled('ember-glimmer') ? 10 : 9);
 
     let ChatEngine = Engine.extend();
     let chatEngineInstance;
@@ -149,34 +150,59 @@ if (isEnabled('ember-application-engines')) {
 
     run(() => {
       appInstance = ApplicationInstance.create({ application });
+      appInstance.setupRegistry();
       chatEngineInstance = appInstance.buildChildEngineInstance('chat');
     });
 
     return chatEngineInstance.boot()
       .then(() => {
         assert.ok(true, 'boot successful');
 
-        [
+        let registrations = [
           'route:basic',
           'event_dispatcher:main',
           'service:-routing'
-        ].forEach(key => {
+        ];
+
+        if (isEnabled('ember-glimmer')) {
+          registrations.push('service:-glimmer-environment');
+        }
+
+        registrations.forEach(key => {
           assert.strictEqual(
             chatEngineInstance.resolveRegistration(key),
             appInstance.resolveRegistration(key),
             `Engine and parent app share registrations for '${key}'`);
         });
 
-        [
+        let singletons = [
           'router:main',
           P`-bucket-cache:main`,
-          '-view-registry:main'
-        ].forEach(key => {
+          '-view-registry:main',
+          '-environment:main'
+        ];
+
+        let env = appInstance.lookup('-environment:main');
+        singletons.push(env.isInteractive ? 'renderer:-dom' : 'renderer:-inert');
+
+        singletons.forEach(key => {
           assert.strictEqual(
             chatEngineInstance.lookup(key),
             appInstance.lookup(key),
             `Engine and parent app share singleton '${key}'`);
         });
       });
   });
+
+  QUnit.test('can build a registry via Ember.ApplicationInstance.setupRegistry() -- simulates ember-test-helpers', function(assert) {
+    let namespace = EmberObject.create({
+      Resolver: { create: function() { } }
+    });
+
+    let registry = Application.buildRegistry(namespace);
+
+    ApplicationInstance.setupRegistry(registry);
+
+    assert.equal(registry.resolve('service:-document'), document);
+  });
 }