Fix merge errors

machty · Dec 22, 2018 · 9cf8497 · 9cf8497
1 parent ddb121b
commit 9cf8497
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/pegjs/mustache/name-character.pegjs b/lib/pegjs/mustache/name-character.pegjs
@@ -1,7 +1,7 @@
 start = newMustacheNameChar
 
 // a character that can be in a mustache name
-newMustacheNameChar = [-_/A-Za-z0-9] / arrayIndex / '.' / '@' / '::'
+newMustacheNameChar = [-_/A-Za-z0-9] / arrayIndex / '.' / '@' / '::' / '$'
 
 // Ember requires that array indexes have a . before them
 arrayIndex = '.[' newMustacheNameChar* ']'
diff --git a/tests/integration/glimmer-component-test.js b/tests/integration/glimmer-component-test.js
@@ -145,10 +145,10 @@ QUnit.test('named block support', function(assert) {
   assert.compilesTo(emblem, '<x-modal><@header as |@title|>Header {{title}}</@header><@body>Body</@body><@footer>Footer</@footer></x-modal>');
 });
 
-test('module namespaces', function() {
+QUnit.test('module namespaces', function(assert) {
   var emblem = w(
     '% my-addon::foo'
   )
 
-  compilesTo(emblem, '<my-addon::foo></my-addon::foo>');
+  assert.compilesTo(emblem, '<my-addon::foo></my-addon::foo>');
 });
diff --git a/tests/integration/mustaches-test.js b/tests/integration/mustaches-test.js
@@ -613,10 +613,10 @@ QUnit.test('named block with block param', function(assert) {
   assert.compilesTo(emblem, '{{#x-layout as |@widget|}}{{#@widget as |a b c|}}Hi.{{/@widget}}{{/x-layout}}');
 });
 
-test('module namespaces', function() {
+QUnit.test('module namespaces', function(assert) {
   var emblem = w(
     '= my-addon::foo'
   )
 
-  compilesTo(emblem, '{{my-addon::foo}}');
+  assert.compilesTo(emblem, '{{my-addon::foo}}');
 });