diff --git a/packages/ember-metal/lib/main.js b/packages/ember-metal/lib/main.js index fb9e1321914..7e66e7a5760 100644 --- a/packages/ember-metal/lib/main.js +++ b/packages/ember-metal/lib/main.js @@ -130,8 +130,7 @@ import { deprecatingAlias, and, or, - any, - collect + any } from 'ember-metal/computed_macros'; computed.empty = empty; @@ -154,7 +153,6 @@ computed.deprecatingAlias = deprecatingAlias; computed.and = and; computed.or = or; computed.any = any; -computed.collect = collect; import { _suspendObserver, diff --git a/packages/ember-runtime/lib/main.js b/packages/ember-runtime/lib/main.js index bbfbbb44e35..0b30bf6e337 100644 --- a/packages/ember-runtime/lib/main.js +++ b/packages/ember-runtime/lib/main.js @@ -54,7 +54,8 @@ import { filterBy, uniq, union, - intersect + intersect, + collect } from 'ember-runtime/computed/reduce_computed_macros'; import Controller from 'ember-runtime/controllers/controller'; @@ -118,6 +119,7 @@ EmComputed.filterBy = filterBy; EmComputed.uniq = uniq; EmComputed.union = union; EmComputed.intersect = intersect; +EmComputed.collect = collect; Ember.String = EmberStringUtils; Ember.Object = EmberObject; diff --git a/packages/ember-runtime/tests/main_test.js b/packages/ember-runtime/tests/main_test.js new file mode 100644 index 00000000000..051efe19bcb --- /dev/null +++ b/packages/ember-runtime/tests/main_test.js @@ -0,0 +1,19 @@ +import Ember from 'ember-runtime'; + +QUnit.module('ember-runtime/main'); + +QUnit.test('Ember.computed.collect', function() { + let MyObj = Ember.Object.extend({ + props: Ember.computed.collect('foo', 'bar', 'baz') + }); + + let myObj = MyObj.create({ + foo: 3, + bar: 5, + baz: 'asdf' + }); + + let propsValue = myObj.get('props'); + + deepEqual(propsValue, [3, 5, 'asdf']); +});