Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not register a router service for Ember <1.13 #100

Merged
merged 1 commit into from
Sep 13, 2015
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
8 changes: 8 additions & 0 deletions lib/ember-test-helpers/has-ember-version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Ember from 'ember';

export default function hasEmberVersion(major, minor) {
var numbers = Ember.VERSION.split('-')[0].split('.');
var actualMajor = parseInt(numbers[0], 10);
var actualMinor = parseInt(numbers[1], 10);
return actualMajor > major || (actualMajor === major && actualMinor >= minor);
}
11 changes: 7 additions & 4 deletions lib/ember-test-helpers/test-module.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { getContext, setContext, unsetContext } from './test-context';
import { Klass } from 'klassy';
import { getResolver } from './test-resolver';
import buildRegistry from './build-registry';
import hasEmberVersion from './has-ember-version';

export default Klass.extend({
init: function(subjectName, description, callbacks) {
Expand Down Expand Up @@ -234,10 +235,12 @@ export default Klass.extend({
this.container = items.container;
this.registry = items.registry;

var thingToRegisterWith = this.registry || this.container;
var router = resolver.resolve('router:main');
router = router || Ember.Router.extend();
thingToRegisterWith.register('router:main', router);
if (hasEmberVersion(1, 13)) {
var thingToRegisterWith = this.registry || this.container;
var router = resolver.resolve('router:main');
router = router || Ember.Router.extend();
thingToRegisterWith.register('router:main', router);
}
},

_setupIsolatedContainer: function() {
Expand Down
3 changes: 2 additions & 1 deletion tests/test-module-for-component-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Ember from 'ember';
import { TestModuleForComponent } from 'ember-test-helpers';
import hasEmberVersion from 'ember-test-helpers/has-ember-version';
import test from 'tests/test-support/qunit-test';
import qunitModuleFor from 'tests/test-support/qunit-module-for';
import { setResolverRegistry } from 'tests/test-support/resolver';
Expand Down Expand Up @@ -237,7 +238,7 @@ moduleForComponent('changing-color', 'component:changing-color -- handles closur
integration: true
});

if (!/^1\.(11|12)/.test(Ember.VERSION)) {
if (hasEmberVersion(1,13)) {
test('handles a closure actions', function() {
expect(1);
this.on('colorChange', function(arg) { equal(arg, 'foo'); });
Expand Down
5 changes: 5 additions & 0 deletions tests/test-module-for-integration-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ test('it can render a template', function() {
equal(this.$('span').text(), 'Hello');
});

test('it can render a link-to', function() {
this.render("{{link-to 'Hi' 'index'}}");
ok(true, 'it renders without fail');
});

test('it complains if you try to use bare render', function() {
var self = this;
throws(function() {
Expand Down