Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addon-test-support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export { default as TestModuleForModel } from './legacy-0-6-x/test-module-for-mo
export { setResolver } from './resolver';
export { default as setupContext, getContext, setContext, unsetContext } from './setup-context';
export { default as teardownContext } from './teardown-context';
export { default as setupRenderingContext } from './setup-rendering-context';
export { default as setupRenderingContext, render, clearRender } from './setup-rendering-context';
export { default as teardownRenderingContext } from './teardown-rendering-context';

import Ember from 'ember';
Expand Down
24 changes: 24 additions & 0 deletions addon-test-support/setup-rendering-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,32 @@ import { run, next } from '@ember/runloop';
import { Promise } from 'rsvp';
import Ember from 'ember';
import global from './global';
import { getContext } from './setup-context';

export const RENDERING_CLEANUP = Object.create(null);

export function render(template) {
let context = getContext();

if (!context || typeof context.render !== 'function') {
throw new Error('Cannot call `render` without having first called `setupRenderingContext`.');
}

return context.render(template);
}

export function clearRender() {
let context = getContext();

if (!context || typeof context.clearRender !== 'function') {
throw new Error(
'Cannot call `clearRender` without having first called `setupRenderingContext`.'
);
}

return context.clearRender();
}

/*
* Responsible for:
*
Expand All @@ -22,6 +45,7 @@ export default function(context) {
RENDERING_CLEANUP[guid] = [
() => {
rootTestElement.innerHTML = fixtureResetValue;
element = undefined;
},
];

Expand Down
22 changes: 22 additions & 0 deletions tests/unit/setup-rendering-context-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import {
setupRenderingContext,
teardownContext,
teardownRenderingContext,
render,
clearRender,
} from 'ember-test-helpers';
import hasEmberVersion from 'ember-test-helpers/has-ember-version';
import hasjQuery from '../helpers/has-jquery';
Expand Down Expand Up @@ -303,4 +305,24 @@ module('setupRenderingContext', function(hooks) {
assert.equal(this.get('foo'), 'updated!');
assert.equal(this.get('bar'), 'updated bar!');
});

test('imported `render` can be used instead of this.render', async function(assert) {
await render(hbs`yippie!!`);

assert.equal(this.element.textContent, 'yippie!!');
});

test('imported clearRender can be used instead of this.clearRender', async function(assert) {
let testingRootElement = document.getElementById('ember-testing');

await this.render(hbs`<p>Hello!</p>`);

assert.equal(this.element.textContent, 'Hello!', 'has rendered content');
assert.equal(testingRootElement.textContent, 'Hello!', 'has rendered content');

await clearRender();
assert.equal(this.element, undefined, 'this.element is reset');

assert.equal(testingRootElement.textContent, '', 'content is cleared');
});
});