[Glimmer 2] Attrs merging should not clobber

emberjs · Jun 19, 2016 · 04f1136 · 04f1136
1 parent 48145b3
commit 04f1136
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/ember-glimmer/lib/utils/process-args.js b/packages/ember-glimmer/lib/utils/process-args.js
@@ -44,7 +44,6 @@ class SimpleArgs {
     let props = new EmptyObject();
     let args = new EmptyObject();
 
-    props.attrs = attrs;
     props[ARGS] = args;
 
     for (let i = 0, l = keys.length; i < l; i++) {
@@ -60,6 +59,8 @@ class SimpleArgs {
       props[name] = value;
     }
 
+    props.attrs = attrs;
+
     return { attrs, props };
   }
 }

diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
@@ -9,7 +9,6 @@ import Component from 'ember-templates/component';
 import jQuery from 'ember-views/system/jquery';
 import { A as emberA } from 'ember-runtime/system/native_array';
 import { setTemplates, set as setTemplate } from 'ember-templates/template_registry';
-import { test } from 'internal-test-helpers/tests/skip-if-glimmer';
 import isEnabled from 'ember-metal/features';
 import require from 'require';
 
@@ -327,7 +326,7 @@ QUnit.test('properties of a component without a template should not collide with
   equal(jQuery('#wrapper').text(), 'Some text inserted by jQuery', 'The component is composed correctly');
 });
 
-test('attrs property of a component without a template should not collide with internal structures', function() {
+QUnit.test('attrs property of a component without a template should not collide with internal structures', function() {
   setTemplate('application', compile('<div id=\'wrapper\'>{{my-component attrs=foo}}</div>'));
 
   boot(() => {