chore(tests): Fix tests for static class rewriting

Author: chriseppstein

Diff for: packages/glimmer-templates/test/template-rewrite-test.ts

@@ -79,9 +79,10 @@ describe('Template Rewriting', function() {
     return pipeline(analyzer, templatePath).then((result) => {
       let { css, ast } = result;
       let res = print(ast);
+      // TODO why is `f` class both static and dynamic?
       assert.deepEqual(minify(res), minify(`
-          <div class={{/css-blocks/components/classnames 0 1 "b" 0}}>
-            <h1 class={{/css-blocks/components/classnames 0 1 "e" 0}}>Hello, <span class={{/css-blocks/components/classnames 2 4 2 (isThick) 1 4 4 2 1 (textStyle) "bold" 1 1 "italic" 1 2 "f" -2 2 0 2 "g" 1 "c" 3 "d" 4}}>World</span>!</h1>
+          <div class="b">
+            <h1 class="e">Hello, <span class="f c {{/css-blocks/components/classnames 2 3 2 (isThick) 1 2 4 2 1 (textStyle) "bold" 1 0 "italic" 1 1 "g" 0 "f" 1 "d" 2}}">World</span>!</h1>
           </div>`));
       assert.deepEqual(minify(result.css), minify(`
           .b { color: red; }
@@ -103,9 +104,10 @@ describe('Template Rewriting', function() {
     return pipeline(analyzer, templatePath).then((result) => {
       let { css, ast } = result;
       let res = print(ast);
+      // TODO: why is `e` both static and dynamic
       assert.deepEqual(minify(res), minify(`
-        <div class={{/css-blocks/components/classnames 0 1 "b" 0}}>
-          <h1 class={{/css-blocks/components/classnames 0 1 "d" 0}}>Hello, <span class={{/css-blocks/components/classnames 3 5 0 isWorld 1 4 0 3 1 4 (isThick) 1 5 4 2 1 (textStyle) "bold" 1 1 "italic" 1 2 "e" -2 2 0 2 "f" 1 "g" 3 "c" 4 "with-dynamic-classes__world--thick" 5}}>World</span>!</h1>
+        <div class="b">
+          <h1 class="d">Hello, <span class="e g {{/css-blocks/components/classnames 3 4 0 isWorld 1 2 0 3 1 2 (isThick) 1 3 4 2 1 (textStyle) "bold" 1 0 "italic" 1 1 "f" 0 "e" 1 "c" 2 "with-dynamic-classes__world--thick" 3}}">World</span>!</h1>
           <div class={{/css-blocks/components/classnames 1 2 0 isWorld 1 1 1 0 "e" 0 "c" 1}}>World</div>
           <div class={{/css-blocks/components/classnames 1 2 0 isWorld 1 0 1 1 "e" 0 "c" 1}}>World</div>
           <div class={{/css-blocks/components/classnames 1 1 0 isWorld 0 1 0 "c" 0}}>World</div>
@@ -123,9 +125,9 @@ describe('Template Rewriting', function() {
       let { css, ast } = result;
       let res = print(ast);
       assert.deepEqual(minify(res), minify(`
-      <div class={{/css-blocks/components/classnames 1 2 2 (isLoading) 1 1 "a" 0 "b" 1}}>
-        <aside class={{/css-blocks/components/classnames 0 4 "g" 0 "h" 1 "c" 2 "d" 3}}> </aside>
-        <article class={{/css-blocks/components/classnames 1 3 0 isRecommended 1 2 1 1 "i" 0 "e" 1 "f" 2}}> </article>
+      <div class="a {{/css-blocks/components/classnames 1 1 2 (isLoading) 1 0 "b" 0}}">
+        <aside class="g h c d"> </aside>
+        <article class="i {{/css-blocks/components/classnames 1 2 0 isRecommended 1 1 1 0 "e" 0 "f" 1}}"> </article>
       </div>
           `));
       assert.deepEqual(minify(result.css), minify(`