Skip to content
This repository has been archived by the owner on Aug 3, 2020. It is now read-only.

setOwner sets the container in Ember 1 #35

Merged
merged 1 commit into from
May 18, 2020
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"dependencies": {
"ember-cli-babel": "^7.19.0",
"ember-cli-version-checker": "^2.1.0",
"ember-compatibility-helpers": "^1.2.1",
"ember-factory-for-polyfill": "^1.3.1"
},
"devDependencies": {
Expand Down
50 changes: 47 additions & 3 deletions tests/unit/setowner-test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
import Ember from 'ember';
import { module, test } from 'ember-qunit';
const { getOwner, setOwner } = Ember;
import EmberObject from '@ember/object';
import { getOwner, setOwner } from '@ember/application';
import { inject as service } from '@ember/service';
import { moduleFor, test } from 'ember-qunit';
import { lte } from 'ember-compatibility-helpers'

module('setOwner');
moduleFor('foo:bar', {
afterEach(assert) {
assert.noDeprecationsOccurred();
}
});

test('setOwner works with getOwner', function(assert) {
let object = {};
Expand All @@ -14,3 +21,40 @@ test('setOwner works with getOwner', function(assert) {

assert.strictEqual(getOwner(object), owner, 'the owner is set correctly');
});

if (lte('1.13.13')) {
test('[Ember 1.x]: setOwner sets the container if the owner has a container', function(assert) {
this.register('service:session', Ember.Object);

let Foo = EmberObject.extend({
session: service()
});

let foo = Foo.create();

setOwner(foo, getOwner(this));

assert.ok(!!foo.get('session'), 'session injection exists');
});

test('[Ember 1.x]: setOwner does not crash if the owner does not have a container', function(assert) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this isn't really testing anything important, just added it as a sanity check

this.register('service:session', Ember.Object);

let Foo = EmberObject.extend({
session: service()
});

let owner = {};
let foo = Foo.create();

setOwner(foo, owner);

assert.throws(() => {
foo.get('session');
}, /Attempting to lookup an injected property on an object without a container/)
});

test('[Ember 1.x]: setOwner does not crash if the owner is undefined', function() {
setOwner({}, undefined);
});
}
11 changes: 9 additions & 2 deletions vendor/install-getowner-polyfill.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import Ember from 'ember';
import { lte } from 'ember-compatibility-helpers';

(function() {
let OWNER;
let OWNER, CONTAINER;

if (!Ember.getOwner || !Ember.setOwner) {
OWNER = '__' + (Date.now()) + '_owner';
CONTAINER = '__' + (Date.now()) + '_container';
}

if (!Ember.getOwner) {
let CONTAINER = '__' + (Date.now()) + '_container';
let REGISTRY = '__' + (Date.now()) + '_registry';
let SAFE_LOOKUP_FACTORY_METHOD = '__' + (Date.now()) + '_lookupFactory';

Expand Down Expand Up @@ -177,6 +178,12 @@ import Ember from 'ember';
if (!Ember.setOwner) {
function setOwner(object, owner) {
object[OWNER] = owner;

if (lte('1.13.13')) {
if (owner && owner[CONTAINER]) {
object.container = owner[CONTAINER];
}
}
}

Object.defineProperty(Ember, 'setOwner', {
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5285,7 +5285,7 @@ ember-cli@~3.18.0:
watch-detector "^1.0.0"
yam "^1.0.0"

ember-compatibility-helpers@^1.1.2:
ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.1.tgz#87c92c4303f990ff455c28ca39fb3ee11441aa16"
integrity sha512-6wzYvnhg1ihQUT5yGqnLtleq3Nv5KNv79WhrEuNU9SwR4uIxCO+KpyC7r3d5VI0EM7/Nmv9Nd0yTkzmTMdVG1A==
Expand Down