Merge 0c8c5ff into 54e5719

ember-codemods · Dec 21, 2019 · c940bf9 · c940bf9
2 parents 54e5719 + 0c8c5ff
commit c940bf9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/transforms/angle-brackets/transform.js b/transforms/angle-brackets/transform.js
@@ -263,11 +263,15 @@ function transformNodeAttributes(tagName, node) {
 }
 
 function getDataAttributesFromParams(params) {
-  return params.filter(param => param.original && `${param.original}`.startsWith('data-'));
+  return params.filter(
+    p => p.original && `${p.original}`.startsWith('data-') && p.type === 'PathExpression'
+  );
 }
 
 function getNonDataAttributesFromParams(params) {
-  return params.filter(p => !(p.original && `${p.original}`.startsWith('data-')));
+  return params.filter(
+    p => !(p.original && `${p.original}`.startsWith('data-')) || p.type === 'StringLiteral'
+  );
 }
 
 function shouldIgnoreMustacheStatement(fullName, config, invokableData) {

diff --git a/transforms/angle-brackets/transform.test.js b/transforms/angle-brackets/transform.test.js
@@ -376,6 +376,7 @@ test('let', () => {
 test('link-to', () => {
   let input = `
     {{#link-to "about"}}About Us{{/link-to}}
+    {{#link-to "data-access"}}Accessing the Crates.io Data{{/link-to}}
     {{#link-to this.dynamicRoute}}About Us{{/link-to}}
     {{#link-to "user" this.first this.second}}Show{{/link-to}}
     {{#link-to "user" this.first this.second (query-params foo="baz")}}Show{{/link-to}}
@@ -386,6 +387,7 @@ test('link-to', () => {
   expect(runTest('link-to.hbs', input)).toMatchInlineSnapshot(`
     "
         <LinkTo @route=\\"about\\">About Us</LinkTo>
+        <LinkTo @route=\\"data-access\\">Accessing the Crates.io Data</LinkTo>
         <LinkTo @route={{this.dynamicRoute}}>About Us</LinkTo>
         <LinkTo @route=\\"user\\" @models={{array this.first this.second}}>Show</LinkTo>
         <LinkTo @route=\\"user\\" @models={{array this.first this.second}} @query={{hash foo=\\"baz\\"}}>Show</LinkTo>