Revert "Revert "Add a basic integration test for Glimmer""

This reverts commit d619a07.

CI was failing because we forgot to push the upstream changes in
Glimmer.

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

@@ -11,7 +11,7 @@ import run from 'ember-metal/run_loop';
 import { computed } from 'ember-metal/computed';
 import DOMHelper from 'ember-htmlbars/system/dom-helper';
 import { buildFakeRegistryWithDeprecations } from 'ember-runtime/mixins/registry_proxy';
-import Renderer from 'ember-metal-views/renderer';
+import { Renderer } from 'ember-metal-views';
 import assign from 'ember-metal/assign';
 import environment from 'ember-metal/environment';
 import RSVP from 'ember-runtime/ext/rsvp';
@@ -147,7 +147,7 @@ const ApplicationInstance = EngineInstance.extend({
 
       registry.register('renderer:-dom', {
         create() {
-          return new Renderer(new DOMHelper(options.document), options.isInteractive);
+          return new Renderer(new DOMHelper(options.document), { destinedForDOM: options.isInteractive });
         }
       });
 

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

@@ -9,7 +9,7 @@ import { get } from 'ember-metal/property_get';
 import { runLoadHooks } from 'ember-runtime/system/lazy_load';
 import run from 'ember-metal/run_loop';
 import Controller from 'ember-runtime/controllers/controller';
-import Renderer from 'ember-metal-views/renderer';
+import { Renderer } from 'ember-metal-views';
 import DOMHelper from 'ember-htmlbars/system/dom-helper';
 import SelectView from 'ember-views/views/select';
 import { OutletView } from 'ember-routing-views/views/outlet';

packages/ember-glimmer/lib/ember-metal-views/index.js

@@ -0,0 +1,18 @@
+export class Renderer {
+  constructor(domHelper, { destinedForDOM, env } = {}) {
+    this._dom = domHelper;
+    this._env = env;
+  }
+
+  appendTo(view, target) {
+    let env = this._env;
+
+    env.begin();
+    view.template.render({ view }, env, { appendTo: target });
+    env.commit();
+  }
+
+  componentInitAttrs() {
+    // TODO: Remove me
+  }
+}

packages/ember-glimmer/lib/ember-template-compiler/system/compile.js

@@ -0,0 +1,22 @@
+import template from './template';
+import require, { has } from 'require';
+
+let compileSpec;
+let Template;
+
+export default function compile(string, options) {
+  if (!compileSpec && has('glimmer-compiler')) {
+    compileSpec = require('glimmer-compiler').compileSpec;
+  }
+
+  if (!Template && has('glimmer-runtime')) {
+    Template = require('glimmer-runtime').Template;
+  }
+
+  if (!compileSpec || !Template) {
+    throw new Error('Cannot call `compile` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `compile`.');
+  }
+
+  let templateSpec = template(compileSpec(string, options));
+  return Template.fromSpec(templateSpec, options.env);
+}

packages/ember-glimmer/lib/ember-template-compiler/system/template.js

@@ -0,0 +1,3 @@
+export default function template(templateSpec) {
+  return JSON.parse(templateSpec);
+}

packages/ember-glimmer/tests/integration/content-test.js

@@ -0,0 +1,10 @@
+import { RenderingTest, moduleFor } from '../utils/test-case';
+
+moduleFor('Content tests', class extends RenderingTest {
+
+  ['TEST: it can render static content']() {
+    this.render('hello');
+    this.assertText('hello');
+  }
+
+});

packages/ember-glimmer/tests/utils/environment.js

@@ -0,0 +1 @@
+export { TestEnvironment as default } from 'glimmer-test-helpers';

packages/ember-glimmer/tests/utils/helpers.js

@@ -0,0 +1,3 @@
+export { DOMHelper } from 'glimmer-runtime';
+export { Renderer } from 'ember-glimmer/ember-metal-views';
+export { default as compile } from 'ember-glimmer/ember-template-compiler/system/compile';

packages/ember-glimmer/tests/utils/package-name.js

@@ -0,0 +1 @@
+export default 'glimmer';

packages/ember-glimmer/tests/utils/test-case.js

@@ -0,0 +1,75 @@
+import packageName from './package-name';
+import Environment from './environment';
+import { compile, DOMHelper, Renderer } from './helpers';
+import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
+import Component from 'ember-views/components/component';
+import jQuery from 'ember-views/system/jquery';
+
+const packageTag = `${packageName.toUpperCase()}: `;
+
+export function moduleFor(description, TestClass) {
+  let context;
+
+  QUnit.module(description, {
+    setup() {
+      context = new TestClass();
+    },
+
+    teardown() {
+      context.teardown();
+    }
+  });
+
+  Object.keys(TestClass.prototype).forEach(name => {
+    if (name.indexOf('TEST: ') === 0) {
+      QUnit.test(name.slice(5), assert => context[name](assert));
+    } else if (name.indexOf('SKIP: ') === 0) {
+      QUnit.skip(name.slice(5), assert => context[name](assert));
+    } else if (name.indexOf(packageTag) === 0) {
+      QUnit.test(name.slice(packageTag.length), assert => context[name](assert));
+    }
+  });
+}
+
+let assert = QUnit.assert;
+
+export class TestCase {
+  teardown() {}
+}
+
+export class RenderingTest extends TestCase {
+  constructor() {
+    super();
+    let dom = new DOMHelper(document);
+    let env = this.env = new Environment(dom);
+    this.renderer = new Renderer(dom, { destinedForDOM: true, env });
+    this.component = null;
+  }
+
+  teardown() {
+    if (this.component) {
+      runDestroy(this.component);
+    }
+  }
+
+  render(templateStr, context = {}) {
+    let { env, renderer } = this;
+
+    let attrs = Object.assign({}, context, {
+      renderer,
+      template: compile(templateStr, { env })
+    });
+
+    this.component = Component.create(attrs);
+
+    runAppend(this.component);
+  }
+
+  rerender() {
+    this.component.rerender();
+  }
+
+  assertText(text) {
+    assert.strictEqual(jQuery('#qunit-fixture').text(), text, `#qunit-fixture contents`);
+  }
+}

packages/ember-htmlbars/lib/system/render-env.js

@@ -1,5 +1,5 @@
 import defaultEnv from 'ember-htmlbars/env';
-import { MorphSet } from 'ember-metal-views/renderer';
+import { MorphSet } from 'ember-metal-views';
 import { getOwner } from 'container/owner';
 
 export default function RenderEnv(options) {

packages/ember-htmlbars/tests/attr_nodes/data_test.js

@@ -2,7 +2,7 @@ import EmberView from 'ember-views/views/view';
 import run from 'ember-metal/run_loop';
 import EmberObject from 'ember-runtime/system/object';
 import compile from 'ember-template-compiler/system/compile';
-import Renderer from 'ember-metal-views/renderer';
+import { Renderer } from 'ember-metal-views';
 import { equalInnerHTML } from 'htmlbars-test-helpers';
 import { domHelper as dom } from 'ember-htmlbars/env';
 import { runAppend, runDestroy } from 'ember-runtime/tests/utils';

packages/ember-metal-views/lib/renderer.js → packages/ember-metal-views/lib/htmlbars-renderer.js

@@ -6,7 +6,7 @@ import setProperties from 'ember-metal/set_properties';
 import buildComponentTemplate from 'ember-views/system/build-component-template';
 import environment from 'ember-metal/environment';
 
-function Renderer(domHelper, destinedForDOM) {
+export function Renderer(domHelper, { destinedForDOM } = {}) {
   this._dom = domHelper;
 
   // This flag indicates whether the resulting rendered element will be
@@ -280,5 +280,3 @@ Renderer.prototype.didDestroyElement = function (view) {
     view.trigger('didDestroyElement');
   }
 }; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
-
-export default Renderer;

packages/ember-metal-views/lib/index.js

@@ -1,2 +1 @@
-import Renderer from 'ember-metal-views/renderer';
-export { Renderer };
+export * from './htmlbars-renderer';

packages/ember-views/lib/index.js

@@ -17,7 +17,7 @@ import {
   states
 } from 'ember-views/views/states';
 
-import Renderer from 'ember-metal-views/renderer';
+import { Renderer } from 'ember-metal-views';
 import { DeprecatedCoreView } from 'ember-views/views/core_view';
 import { DeprecatedView } from 'ember-views/views/view';
 import { DeprecatedContainerView } from 'ember-views/views/container_view';

packages/ember-views/lib/views/core_view.js

@@ -6,7 +6,7 @@ import Evented from 'ember-runtime/mixins/evented';
 import ActionHandler, { deprecateUnderscoreActions } from 'ember-runtime/mixins/action_handler';
 import { typeOf } from 'ember-runtime/utils';
 
-import Renderer from 'ember-metal-views/renderer';
+import { Renderer } from 'ember-metal-views';
 import { cloneStates, states } from 'ember-views/views/states';
 import { internal } from 'htmlbars-runtime';
 import require from 'require';