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

Guard for missing Ember.inject. #106

Merged
merged 2 commits into from
Oct 2, 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
31 changes: 20 additions & 11 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,42 @@
module.exports = {
scenarios: [
{
name: 'ember-1.11.3',
name: 'ember-1.10',
dependencies: {
"ember": "1.11.3"
"ember": "~1.10.0"
},
devDependencies: {
"ember-data": "~1.0.0-beta.19.2"
}
},
{
name: 'ember-1.12.1',
name: 'ember-1.11',
dependencies: {
"ember": "1.12.1",
"ember": "~1.11.3"
},
devDependencies: {
"ember-data": "~1.0.0-beta.19.2"
}
},
{
name: 'ember-1.13.8',
name: 'ember-1.12',
dependencies: {
"ember": "1.13.8"
"ember": "~1.12.1"
},
devDependencies: {
"ember-data": "~1.0.0-beta.19.2"
}
},
{
name: 'ember-1.13',
dependencies: {
"ember": "~1.13.8"
}
},
{
name: 'ember-2.0.0',
name: 'ember-2.0',
dependencies: {
"ember": "2.0.0"
"ember": "~2.0.0"
},
devDependencies: {
"ember-data": "~2.0.0-beta.2"
Expand All @@ -39,7 +48,7 @@ module.exports = {
"ember": "components/ember#release"
},
devDependencies: {
"ember-data": "~2.0.0-beta.2"
"ember-data": "~2.0.0"
},
resolutions: {
"ember": "release"
Expand All @@ -51,7 +60,7 @@ module.exports = {
"ember": "components/ember#beta"
},
devDependencies: {
"ember-data": "~2.0.0-beta.2"
"ember-data": "~2.0.0"
},
resolutions: {
"ember": "beta"
Expand All @@ -63,7 +72,7 @@ module.exports = {
"ember": "components/ember#canary"
},
devDependencies: {
"ember-data": "~2.0.0-beta.2"
"ember-data": "~2.0.0"
},
resolutions: {
"ember": "canary"
Expand Down
15 changes: 9 additions & 6 deletions lib/ember-test-helpers/test-module.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,15 @@ export default Klass.extend({

var context = this.context = getContext();

Object.keys(Ember.inject).forEach(function(typeName) {
context.inject[typeName] = function(name, opts) {
var alias = (opts && opts.as) || name;
Ember.set(context, alias, context.container.lookup(typeName + ':' + name));
};
});
if (Ember.inject) {
var keys = (Object.keys || Ember.keys)(Ember.inject);
keys.forEach(function(typeName) {
context.inject[typeName] = function(name, opts) {
var alias = (opts && opts.as) || name;
Ember.set(context, alias, context.container.lookup(typeName + ':' + name));
};
});
}
},

setupTestElements: function() {
Expand Down
18 changes: 10 additions & 8 deletions tests/test-module-for-component-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,17 @@ test('can lookup components in its layout', function() {
equal(component._state, 'inDOM');
});

test('can use the component keyword in its layout', function() {
expect(1);
var component = this.subject({
colors: ['red', 'green', 'blue'],
layout: Ember.Handlebars.compile("{{component 'x-foo'}}")
if (hasEmberVersion(1,11)) {
test('can use the component keyword in its layout', function() {
expect(1);
var component = this.subject({
colors: ['red', 'green', 'blue'],
layout: Ember.Handlebars.compile("{{component 'x-foo'}}")
});
this.render();
equal(component._state, 'inDOM');
});
this.render();
equal(component._state, 'inDOM');
});
}

test('clears out views from test to test', function() {
expect(1);
Expand Down
11 changes: 7 additions & 4 deletions tests/test-module-for-integration-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ember from 'ember';
import hasEmberVersion from 'ember-test-helpers/has-ember-version';
import { TestModuleForComponent } from 'ember-test-helpers';
import test from 'tests/test-support/qunit-test';
import qunitModuleFor from 'tests/test-support/qunit-module-for';
Expand Down Expand Up @@ -26,10 +27,12 @@ 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');
});
if (hasEmberVersion(1,11)) {
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;
Expand Down
39 changes: 21 additions & 18 deletions tests/test-module-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { TestModule, getContext } 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 @@ -178,26 +179,28 @@ test("throws an error when declaring integration: true and needs in the same mod
ok(result, "should throw an Error when integration: true and needs are provided");
});

moduleFor('component:x-foo', 'should be able to override factories in integration mode', {
beforeSetup: function() {
setupRegistry();
},
if (hasEmberVersion(1,11)) {
moduleFor('component:x-foo', 'should be able to override factories in integration mode', {
beforeSetup: function() {
setupRegistry();
},

integration: true
});
integration: true
});

test('gets the default by default', function() {
var thing = this.container.lookup('foo:thing');
test('gets the default by default', function() {
var thing = this.container.lookup('foo:thing');

ok(thing.fromDefaultRegistry, 'found from the default registry');
});
ok(thing.fromDefaultRegistry, 'found from the default registry');
});

test('can override the default', function() {
this.register('foo:thing', Ember.Object.extend({
notTheDefault: true
}));
var thing = this.container.lookup('foo:thing');
test('can override the default', function() {
this.register('foo:thing', Ember.Object.extend({
notTheDefault: true
}));
var thing = this.container.lookup('foo:thing');

ok(!thing.fromDefaultRegistry, 'should not be found from the default registry');
ok(thing.notTheDefault, 'found from the overridden factory');
});
ok(!thing.fromDefaultRegistry, 'should not be found from the default registry');
ok(thing.notTheDefault, 'found from the overridden factory');
});
}