From aa537322d9c7980a85fac486b0b5e522e504c4bd Mon Sep 17 00:00:00 2001 From: Chad Hietala Date: Mon, 18 Jul 2016 16:19:00 -0700 Subject: [PATCH] [GLimmer2/Cleanup] Remove tests related to private View APIs --- .../components/target-action-test.js | 2 +- .../tests/integration/syntax/each-test.js | 2 +- .../tests/views/view/view_lifecycle_test.js | 243 ------------------ 3 files changed, 2 insertions(+), 245 deletions(-) delete mode 100644 packages/ember-views/tests/views/view/view_lifecycle_test.js diff --git a/packages/ember-glimmer/tests/integration/components/target-action-test.js b/packages/ember-glimmer/tests/integration/components/target-action-test.js index daa224789ec..8cba44f2e51 100644 --- a/packages/ember-glimmer/tests/integration/components/target-action-test.js +++ b/packages/ember-glimmer/tests/integration/components/target-action-test.js @@ -120,7 +120,7 @@ moduleFor('Components test: sendAction', class extends RenderingTest { this.assertNamedSendCount('didStartPlaying', 1); } - ['@htmlbars Calling sendAction on a component with a {{mut}} attr calls the function with arguments']() { + ['@test Calling sendAction on a component with a {{mut}} attr calls the function with arguments']() { this.renderDelegate('{{action-delegate playing=(mut playing)}}', { playing: null }); diff --git a/packages/ember-glimmer/tests/integration/syntax/each-test.js b/packages/ember-glimmer/tests/integration/syntax/each-test.js index 8d947470d60..dac81dc7e68 100644 --- a/packages/ember-glimmer/tests/integration/syntax/each-test.js +++ b/packages/ember-glimmer/tests/integration/syntax/each-test.js @@ -332,7 +332,7 @@ moduleFor('Syntax test: {{#each as}}', class extends EachTest { this.assertInvariants(oldSnapshot, this.takeSnapshot()); } - [`@htmlbars it renders all items with duplicate key values`]() { + [`@test it renders all items with duplicate key values`]() { this.render(`{{#each list key="text" as |item|}}{{item.text}}{{/each}}`, { list: emberA([{ text: 'Hello' }, { text: 'Hello' }, { text: 'Hello' }]) }); diff --git a/packages/ember-views/tests/views/view/view_lifecycle_test.js b/packages/ember-views/tests/views/view/view_lifecycle_test.js deleted file mode 100644 index ac7d4c37140..00000000000 --- a/packages/ember-views/tests/views/view/view_lifecycle_test.js +++ /dev/null @@ -1,243 +0,0 @@ -import { context } from 'ember-environment'; -import run from 'ember-metal/run_loop'; -import jQuery from 'ember-views/system/jquery'; -import EmberView from 'ember-views/views/view'; -import { compile } from 'ember-template-compiler'; -import { registerHelper } from 'ember-htmlbars/helpers'; - -const originalLookup = context.lookup; -let lookup, view; - -import { test, testModule } from 'internal-test-helpers/tests/skip-if-glimmer'; - -QUnit.module('views/view/view_lifecycle_test - pre-render', { - setup() { - context.lookup = lookup = {}; - }, - - teardown() { - if (view) { - run(() => view.destroy()); - } - context.lookup = originalLookup; - } -}); - -test('should not affect rendering if rerender is called before initial render happens', function() { - run(() => { - view = EmberView.create({ - template: compile('Rerender me!') - }); - - view.rerender(); - view.append(); - }); - - equal(view.$().text(), 'Rerender me!', 'renders correctly if rerender is called first'); -}); - -test('should not affect rendering if destroyElement is called before initial render happens', function() { - run(() => { - view = EmberView.create({ - template: compile('Don\'t destroy me!') - }); - - view.destroyElement(); - view.append(); - }); - - equal(view.$().text(), 'Don\'t destroy me!', 'renders correctly if destroyElement is called first'); -}); - -testModule('views/view/view_lifecycle_test - in render', { - teardown() { - if (view) { - run(() => view.destroy()); - } - } -}); - -test('rerender of top level view during rendering should throw', function() { - registerHelper('throw', function() { - view.rerender(); - }); - view = EmberView.create({ - template: compile('{{throw}}') - }); - throws(() => run(view, view.appendTo, '#qunit-fixture'), - /Something you did caused a view to re-render after it rendered but before it was inserted into the DOM./, - 'expected error was not raised' - ); -}); - - -QUnit.module('views/view/view_lifecycle_test - hasElement', { - teardown() { - if (view) { - run(() => view.destroy()); - } - } -}); - -QUnit.test('createElement puts the view into the hasElement state', function() { - let hasCalledInsertElement = false; - view = EmberView.create({ - didInsertElement() { - hasCalledInsertElement = true; - } - }); - - run(() => view.createElement()); - - ok(!hasCalledInsertElement, 'didInsertElement is not called'); - equal(view.element.tagName, 'DIV', 'content is rendered'); -}); - -QUnit.test('trigger rerender on a view in the hasElement state doesn\'t change its state to inDOM', function() { - let hasCalledInsertElement = false; - view = EmberView.create({ - didInsertElement() { - hasCalledInsertElement = true; - } - }); - - run(() => { - view.createElement(); - view.rerender(); - }); - - ok(!hasCalledInsertElement, 'didInsertElement is not called'); - equal(view.element.tagName, 'DIV', 'content is rendered'); -}); - - -QUnit.module('views/view/view_lifecycle_test - in DOM', { - teardown() { - if (view) { - run(() => view.destroy()); - } - } -}); - -test('should replace DOM representation if rerender() is called after element is created', function() { - run(() => { - view = EmberView.extend({ - rerender() { - this._super(...arguments); - } - }).create({ - template: compile('Do not taunt happy fun {{unbound view.shape}}'), - shape: 'sphere' - }); - - view.volatileProp = view.get('context.shape'); - view.append(); - }); - - equal(view.$().text(), 'Do not taunt happy fun sphere', - 'precond - creates DOM element'); - - view.shape = 'ball'; - - equal(view.$().text(), 'Do not taunt happy fun sphere', - 'precond - keeps DOM element'); - - run(() => view.rerender()); - - equal(view.$().text(), 'Do not taunt happy fun ball', - 'rerenders DOM element when rerender() is called'); -}); - -QUnit.test('should destroy DOM representation when destroyElement is called', function() { - run(() => { - view = EmberView.create({ - template: compile('Don\'t fear the reaper') - }); - - view.append(); - }); - - ok(view.get('element'), 'precond - generates a DOM element'); - - run(() => view.destroyElement()); - - ok(!view.get('element'), 'destroys view when destroyElement() is called'); -}); - -QUnit.test('should destroy DOM representation when destroy is called', function() { - run(() => { - view = EmberView.create({ - template: compile('
Don\'t fear the reaper
') - }); - - view.append(); - }); - - ok(view.get('element'), 'precond - generates a DOM element'); - - run(() => view.destroy()); - - ok(jQuery('#warning').length === 0, 'destroys element when destroy() is called'); -}); - -QUnit.test('should throw an exception if trying to append an element that is already in DOM', function() { - run(() => { - view = EmberView.create({ - template: compile('Broseidon, King of the Brocean') - }); - - view.append(); - }); - - ok(view.get('element'), 'precond - creates DOM element'); - - throws(() => { - run(() => view.append()); - }, null, 'raises an exception on second append'); -}); - -QUnit.module('views/view/view_lifecycle_test - destroyed'); - -QUnit.test('should throw an exception when rerender is called after view is destroyed', function() { - run(() => { - view = EmberView.create({ - template: compile('foo') - }); - - view.append(); - }); - - run(() => view.destroy()); - - throws(() => view.rerender(), null, 'throws an exception when calling rerender'); -}); - -QUnit.test('should throw an exception when destroyElement is called after view is destroyed', function() { - run(() => { - view = EmberView.create({ - template: compile('foo') - }); - - view.append(); - }); - - run(() => view.destroy()); - - throws(() => view.destroyElement(), null, 'throws an exception when calling destroyElement'); -}); - -QUnit.test('trigger rerender on a view in the inDOM state keeps its state as inDOM', function() { - run(() => { - view = EmberView.create({ - template: compile('foo') - }); - - view.append(); - }); - - run(() => view.rerender()); - - equal(view._currentState, view._states.inDOM, 'the view is still in the inDOM state'); - - run(() => view.destroy()); -});