Skip to content

Commit

Permalink
Add new API that requires much less "magical wrapping".
Browse files Browse the repository at this point in the history
Thanks to turbo87 for working on a very similar API in ember-mocha,
this is largely a copy/paste of that effort...
  • Loading branch information
rwjblue authored and Turbo87 committed Apr 12, 2017
1 parent 230b9c9 commit 7f7d75a
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 1 deletion.
16 changes: 15 additions & 1 deletion lib/ember-qunit.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,27 @@ import moduleFor from 'ember-qunit/module-for';
import moduleForComponent from 'ember-qunit/module-for-component';
import moduleForModel from 'ember-qunit/module-for-model';
import QUnitAdapter from 'ember-qunit/adapter';
import { setResolver } from 'ember-test-helpers';
import setupTestFactory from 'ember-qunit/setup-test-factory';
import {
setResolver,
TestModule,
TestModuleForIntegration,
TestModuleForAcceptance
} from 'ember-test-helpers';

export { module, test, skip, only, todo } from 'qunit';

const setupTest = setupTestFactory(TestModule);
const setupAcceptanceTest = setupTestFactory(TestModuleForAcceptance);
const setupIntegrationTest = setupTestFactory(TestModuleForIntegration);

export {
moduleFor,
moduleForComponent,
moduleForModel,
setupTest,
setupAcceptanceTest,
setupIntegrationTest,
setResolver,
QUnitAdapter
};
20 changes: 20 additions & 0 deletions lib/ember-qunit/setup-test-factory.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
export default function(Constructor) {
return function setupTest(hooks, options) {
let module;

hooks.before(function() {
// TODO: should we actually have this in the API
module = new Constructor('', options);
});

hooks.beforeEach(function() {
module.setContext(this);

return module.setup(...arguments);
});

hooks.afterEach(function() {
return module.teardown(...arguments);
});
};
}
35 changes: 35 additions & 0 deletions tests/setup-integration-test-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/* global setTimeout */

import Ember from 'ember';
import { module, test, setupIntegrationTest } from 'ember-qunit';
import { setResolverRegistry } from './test-support/resolver';

var PrettyColor = Ember.Component.extend({
classNames: ['pretty-color'],
attributeBindings: ['style'],
style: function(){
return 'color: ' + this.get('name') + ';';
}.property('name')
});

function setupRegistry() {
setResolverRegistry({
'component:x-foo': Ember.Component.extend(),
'component:pretty-color': PrettyColor,
'template:components/pretty-color': Ember.Handlebars.compile('Pretty Color: <span class="color-name">{{name}}</span>')
});
}

module('component:x-foo', function(hooks) {
hooks.before(setupRegistry);

setupIntegrationTest(hooks);

test('renders', function(assert) {
assert.expect(1);

this.render(Ember.Handlebars.compile(`{{pretty-color name="red"}}`));

assert.equal(this.$('.color-name').text(), 'red');
});
});

0 comments on commit 7f7d75a

Please sign in to comment.