woops

adopted-ember-addons · Jul 29, 2018 · 87d474e · 87d474e
1 parent 19713cf
commit 87d474e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/addon/utils/computed/object-to-array.js b/addon/utils/computed/object-to-array.js
@@ -2,10 +2,10 @@
 
 import { computed, get } from '@ember/object';
 import { typeOf } from '@ember/utils';
-import { assign } from '@ember/polyfills';
+import { assign as EmberAssign } from '@ember/polyfills';
 import { merge } from '@ember/polyfills'
 
-const assign = assign || merge;
+const assign = EmberAssign || merge;
 
 /*::
 import type Change from 'ember-changeset/-private/change';

diff --git a/tests/unit/changeset-test.js b/tests/unit/changeset-test.js
@@ -1177,7 +1177,7 @@ test('#cast noops if no keys are passed', function(assert) {
  * #isValidating
  */
 
-test('scott isValidating returns true when validations have not resolved', function(assert) {
+test('isValidating returns true when validations have not resolved', function(assert) {
   let dummyChangeset;
   let _validator = () => new Promise(() => {});
   let _validations = {