Skip to content

Commit c46fd47

Browse files
committed
Leave note about test failure
1 parent 586a6db commit c46fd47

File tree

3 files changed

+30
-24
lines changed

3 files changed

+30
-24
lines changed

packages/container/lib/container.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* globals Proxy */
12
import {
23
dictionary,
34
symbol,
@@ -9,7 +10,7 @@ import { ENV } from 'ember-environment';
910
import { assert, deprecate, runInDebug, isFeatureEnabled } from 'ember-metal';
1011

1112
const CONTAINER_OVERRIDE = symbol('CONTAINER_OVERRIDE');
12-
export const HAS_PROXY = !!Proxy;
13+
const HAS_PROXY = typeof Proxy === 'function';
1314

1415
/**
1516
A container used to instantiate and cache objects.

packages/ember/tests/helpers/helper_registration_test.js

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Controller /*, Service, inject*/} from 'ember-runtime';
1+
import { Controller, Service, inject } from 'ember-runtime';
22
import { run } from 'ember-metal';
33
import { compile } from 'ember-template-compiler';
44
import {
5-
//Helper,
5+
Helper,
66
helper,
77
setTemplates,
88
setTemplate
@@ -90,23 +90,24 @@ QUnit.test('Undashed helpers registered on the container can be invoked', functi
9090
equal(jQuery('#wrapper').text(), 'OMG|boo|ya', 'The helper was invoked from the container');
9191
});
9292

93-
// QUnit.test('Helpers can receive injections', function() {
94-
// setTemplate('application', compile('<div id=\'wrapper\'>{{full-name}}</div>'));
95-
96-
// let serviceCalled = false;
97-
// boot(() => {
98-
// appInstance.register('service:name-builder', Service.extend({
99-
// build() {
100-
// serviceCalled = true;
101-
// }
102-
// }));
103-
// appInstance.register('helper:full-name', Helper.extend({
104-
// nameBuilder: inject.service('name-builder'),
105-
// compute() {
106-
// this.get('nameBuilder').build();
107-
// }
108-
// }));
109-
// });
110-
111-
// ok(serviceCalled, 'service was injected, method called');
112-
// });
93+
// This fails with: Assertion Failed: Attempting to lookup an injected property on an object without a container, ensure that the object was instantiated via a container.
94+
QUnit.skip('Helpers can receive injections', function() {
95+
setTemplate('application', compile('<div id=\'wrapper\'>{{full-name}}</div>'));
96+
97+
let serviceCalled = false;
98+
boot(() => {
99+
appInstance.register('service:name-builder', Service.extend({
100+
build() {
101+
serviceCalled = true;
102+
}
103+
}));
104+
appInstance.register('helper:full-name', Helper.extend({
105+
nameBuilder: inject.service('name-builder'),
106+
compute() {
107+
this.get('nameBuilder').build();
108+
}
109+
}));
110+
});
111+
112+
ok(serviceCalled, 'service was injected, method called');
113+
});

tests/node/helpers/build-owner.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module.exports = function buildOwner(Ember, resolver) {
2-
var Owner = Ember.Object.extend(Ember._RegistryProxyMixin, Ember._ContainerProxyMixin);
2+
var Owner = Ember.Object.extend(Ember._RegistryProxyMixin, Ember._ContainerProxyMixin, {
3+
factoryFor() {
4+
return this.__container__.factoryFor(...arguments);
5+
}
6+
});
37

48
var namespace = Ember.Object.create({
59
Resolver: { create: function() { return resolver; } }

0 commit comments

Comments
 (0)