Skip to content

Commit

Permalink
Merge pull request #7 from spencer516/factory-arg-fix
Browse files Browse the repository at this point in the history
Pass result of `factoryFor`
  • Loading branch information
rwjblue committed Mar 2, 2019
2 parents dc296ef + 9ef46e6 commit 6975c69
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 3 deletions.
24 changes: 24 additions & 0 deletions tests/integration/components/modifier-manager-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@ module('Integration | Component | modifier-manager', function(hooks) {
});
});

module('createModifier', function() {
test('it passes the `factoryFor` definition', async function(assert) {
assert.expect(1);

class MyModifier {}

this.owner.register('modifier:my-modifier', MyModifier);

Ember._setModifierManager(
() => ({
createModifier(factory) {
assert.equal(factory.class, MyModifier, 'the factory class is Modifier');
},
installModifier() {},
updateModifier() {},
destroyModifier() {},
}),
MyModifier
);

await render(hbs`<div {{my-modifier}}></div>`);
});
});

module('installModifier', function(hooks) {
hooks.beforeEach(function() {
class DidInsertModifier {}
Expand Down
6 changes: 3 additions & 3 deletions vendor/ember-modifier-manager-polyfill.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ import { lte, gte } from 'ember-compatibility-helpers';
let manager = managerFactory(owner);

if (gte('3.6.0-alpha.1')) {
return new Polyfilled_CustomModifierDefinition(name, modifier.class, manager);
return new Polyfilled_CustomModifierDefinition(name, modifier, manager);
} else {
return new Polyfilled_CustomModifierManagerLt36(name, modifier.class, manager);
return new Polyfilled_CustomModifierManagerLt36(name, modifier, manager);
}
}
}
Expand Down Expand Up @@ -205,7 +205,7 @@ import { lte, gte } from 'ember-compatibility-helpers';
let managerFactory = getModifierManager(modifier.class);
let manager = managerFactory(owner);

return new Polyfilled_CustomModifierManagerLt36(name, modifier.class, manager);
return new Polyfilled_CustomModifierManagerLt36(name, modifier, manager);
}
}

Expand Down

0 comments on commit 6975c69

Please sign in to comment.