From bc155f956c79e35f3c37d342f35423fee4c78dd1 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Mon, 30 Mar 2015 16:41:13 +1100
Subject: [PATCH] add es6.spec.templateLiterals transformer and rename
 es6.symbols to es6.spec.symbols

---
 .../transformation/transformers/deprecated.json  |  3 ++-
 .../es6/{symbols.js => spec.symbols.js}          |  0
 .../transformers/es6/spec.template-literals.js   | 11 +++++++++++
 .../transformers/es6/template-literals.js        | 16 ++++------------
 src/babel/transformation/transformers/index.js   |  4 +++-
 .../basic/actual.js                              |  0
 .../basic/exec.js                                |  0
 .../basic/expected.js                            |  0
 .../options.json                                 |  0
 .../escape-quotes/actual.js                      |  0
 .../escape-quotes/expected.js                    |  0
 .../functions/actual.js                          |  0
 .../functions/expected.js                        |  0
 .../multiline/actual.js                          |  0
 .../multiline/expected.js                        |  0
 .../multiple/actual.js                           |  0
 .../multiple/expected.js                         |  0
 .../none/actual.js                               |  0
 .../none/expected.js                             |  0
 .../only/actual.js                               |  0
 .../only/expected.js                             |  0
 .../es6.spec.template-literals/options.json      |  3 +++
 .../single/actual.js                             |  0
 .../single/expected.js                           |  0
 .../statement/actual.js                          |  0
 .../statement/expected.js                        |  0
 .../escape-quotes/actual.js                      |  1 +
 .../escape-quotes/expected.js                    |  3 +++
 .../es6.template-literals/functions/actual.js    |  1 +
 .../es6.template-literals/functions/expected.js  |  3 +++
 .../es6.template-literals/multiline/actual.js    |  3 +++
 .../es6.template-literals/multiline/expected.js  |  3 +++
 .../es6.template-literals/multiple/actual.js     |  1 +
 .../es6.template-literals/multiple/expected.js   |  3 +++
 .../es6.template-literals/none/actual.js         |  1 +
 .../es6.template-literals/none/expected.js       |  3 +++
 .../es6.template-literals/only/actual.js         |  1 +
 .../es6.template-literals/only/expected.js       |  3 +++
 .../es6.template-literals/single/actual.js       |  1 +
 .../es6.template-literals/single/expected.js     |  3 +++
 .../es6.template-literals/statement/actual.js    |  1 +
 .../es6.template-literals/statement/expected.js  |  3 +++
 .../tag-loose/actual.js                          |  0
 .../tag-loose/expected.js                        |  0
 .../tag-loose/options.json                       |  0
 .../tag/actual.js                                |  0
 .../tag/expected.js                              |  0
 47 files changed, 57 insertions(+), 14 deletions(-)
 rename src/babel/transformation/transformers/es6/{symbols.js => spec.symbols.js} (100%)
 create mode 100644 src/babel/transformation/transformers/es6/spec.template-literals.js
 rename test/core/fixtures/transformation/{es6.symbols => es6.spec.symbols}/basic/actual.js (100%)
 rename test/core/fixtures/transformation/{es6.symbols => es6.spec.symbols}/basic/exec.js (100%)
 rename test/core/fixtures/transformation/{es6.symbols => es6.spec.symbols}/basic/expected.js (100%)
 rename test/core/fixtures/transformation/{es6.symbols => es6.spec.symbols}/options.json (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/escape-quotes/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/escape-quotes/expected.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/functions/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/functions/expected.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/multiline/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/multiline/expected.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/multiple/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/multiple/expected.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/none/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/none/expected.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/only/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/only/expected.js (100%)
 create mode 100644 test/core/fixtures/transformation/es6.spec.template-literals/options.json
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/single/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/single/expected.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/statement/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.spec.template-literals}/statement/expected.js (100%)
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/escape-quotes/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/escape-quotes/expected.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/functions/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/functions/expected.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/multiline/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/multiline/expected.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/multiple/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/multiple/expected.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/none/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/none/expected.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/only/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/only/expected.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/single/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/single/expected.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/statement/actual.js
 create mode 100644 test/core/fixtures/transformation/es6.template-literals/statement/expected.js
 rename test/core/fixtures/transformation/{es6-template-literals => es6.template-literals}/tag-loose/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.template-literals}/tag-loose/expected.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.template-literals}/tag-loose/options.json (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.template-literals}/tag/actual.js (100%)
 rename test/core/fixtures/transformation/{es6-template-literals => es6.template-literals}/tag/expected.js (100%)

diff --git a/src/babel/transformation/transformers/deprecated.json b/src/babel/transformation/transformers/deprecated.json
index 83c6892fbb..bca3bdc1e0 100644
--- a/src/babel/transformation/transformers/deprecated.json
+++ b/src/babel/transformation/transformers/deprecated.json
@@ -1,7 +1,8 @@
 {
   "selfContained": "runtime",
   "unicode-regex": "regex.unicode",
-  "spec.typeofSymbol": "es6.symbols",
+  "spec.typeofSymbol": "es6.spec.symbols",
+  "es6.symbols": "es6.spec.symbols",
 
   "minification.deadCodeElimination": "utility.deadCodeElimination",
   "minification.removeConsoleCalls": "utility.removeConsole",
diff --git a/src/babel/transformation/transformers/es6/symbols.js b/src/babel/transformation/transformers/es6/spec.symbols.js
similarity index 100%
rename from src/babel/transformation/transformers/es6/symbols.js
rename to src/babel/transformation/transformers/es6/spec.symbols.js
diff --git a/src/babel/transformation/transformers/es6/spec.template-literals.js b/src/babel/transformation/transformers/es6/spec.template-literals.js
new file mode 100644
index 0000000000..89517c2f90
--- /dev/null
+++ b/src/babel/transformation/transformers/es6/spec.template-literals.js
@@ -0,0 +1,11 @@
+import * as t from "../../../types";
+
+export var metadata = {
+  optional: true
+};
+
+export function TemplateLiteral(node, parent, scope, file) {
+  for (var i = 0; i < node.expressions.length; i++) {
+    node.expressions[i] = t.callExpression(t.identifier("String"), [node.expressions[i]]);
+  }
+}
diff --git a/src/babel/transformation/transformers/es6/template-literals.js b/src/babel/transformation/transformers/es6/template-literals.js
index dfa392cd7e..9574ed5c29 100644
--- a/src/babel/transformation/transformers/es6/template-literals.js
+++ b/src/babel/transformation/transformers/es6/template-literals.js
@@ -1,17 +1,9 @@
 import * as t from "../../../types";
 
-var buildBinaryExpression = function (left, right, file) {
-  return t.binaryExpression("+", left, coerce(right, file));
+var buildBinaryExpression = function (left, right) {
+  return t.binaryExpression("+", left, right);
 };
 
-function coerce(node, file) {
-  if (file.isLoose("es7.templateLiterals") || (t.isLiteral(node) && typeof node.value === "string")) {
-    return node;
-  } else {
-    return t.callExpression(t.identifier("String"), [node]);
-  }
-}
-
 export function check(node) {
   return t.isTemplateLiteral(node) || t.isTaggedTemplateExpression(node);
 }
@@ -59,10 +51,10 @@ export function TemplateLiteral(node, parent, scope, file) {
     var last = nodes[nodes.length - 1];
     if (t.isLiteral(last, { value: "" })) nodes.pop();
 
-    var root = buildBinaryExpression(nodes.shift(), nodes.shift(), file);
+    var root = buildBinaryExpression(nodes.shift(), nodes.shift());
 
     for (i = 0; i < nodes.length; i++) {
-      root = buildBinaryExpression(root, nodes[i], file);
+      root = buildBinaryExpression(root, nodes[i]);
     }
 
     return root;
diff --git a/src/babel/transformation/transformers/index.js b/src/babel/transformation/transformers/index.js
index 31810b952b..211542f00d 100644
--- a/src/babel/transformation/transformers/index.js
+++ b/src/babel/transformation/transformers/index.js
@@ -37,6 +37,8 @@ export default {
   "es6.objectSuper":                       require("./es6/object-super"),
   "es7.objectRestSpread":                  require("./es7/object-rest-spread"),
   "es7.exponentiationOperator":            require("./es7/exponentiation-operator"),
+
+  "es6.spec.templateLiterals":             require("./es6/spec.template-literals"),
   "es6.templateLiterals":                  require("./es6/template-literals"),
 
   "es5.properties.mutators":               require("./es5/properties.mutators"),
@@ -97,7 +99,7 @@ export default {
 
   "es7.doExpressions":                     require("./es7/do-expressions"),
 
-  "es6.symbols":                           require("./es6/symbols"),
+  "es6.spec.symbols":                      require("./es6/spec.symbols"),
   "spec.undefinedToVoid":                  require("./spec/undefined-to-void"),
 
   _strict:                                 require("./internal/strict"),
diff --git a/test/core/fixtures/transformation/es6.symbols/basic/actual.js b/test/core/fixtures/transformation/es6.spec.symbols/basic/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.symbols/basic/actual.js
rename to test/core/fixtures/transformation/es6.spec.symbols/basic/actual.js
diff --git a/test/core/fixtures/transformation/es6.symbols/basic/exec.js b/test/core/fixtures/transformation/es6.spec.symbols/basic/exec.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.symbols/basic/exec.js
rename to test/core/fixtures/transformation/es6.spec.symbols/basic/exec.js
diff --git a/test/core/fixtures/transformation/es6.symbols/basic/expected.js b/test/core/fixtures/transformation/es6.spec.symbols/basic/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.symbols/basic/expected.js
rename to test/core/fixtures/transformation/es6.spec.symbols/basic/expected.js
diff --git a/test/core/fixtures/transformation/es6.symbols/options.json b/test/core/fixtures/transformation/es6.spec.symbols/options.json
similarity index 100%
rename from test/core/fixtures/transformation/es6.symbols/options.json
rename to test/core/fixtures/transformation/es6.spec.symbols/options.json
diff --git a/test/core/fixtures/transformation/es6-template-literals/escape-quotes/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/escape-quotes/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/escape-quotes/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/escape-quotes/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/escape-quotes/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/escape-quotes/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/escape-quotes/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/escape-quotes/expected.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/functions/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/functions/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/functions/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/functions/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/functions/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/functions/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/functions/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/functions/expected.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/multiline/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/multiline/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/multiline/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/multiline/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/multiline/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/multiline/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/multiline/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/multiline/expected.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/multiple/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/multiple/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/multiple/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/multiple/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/multiple/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/multiple/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/multiple/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/multiple/expected.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/none/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/none/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/none/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/none/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/none/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/none/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/none/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/none/expected.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/only/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/only/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/only/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/only/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/only/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/only/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/only/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/only/expected.js
diff --git a/test/core/fixtures/transformation/es6.spec.template-literals/options.json b/test/core/fixtures/transformation/es6.spec.template-literals/options.json
new file mode 100644
index 0000000000..1abc0c551a
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.spec.template-literals/options.json
@@ -0,0 +1,3 @@
+{
+  "optional": ["es6.spec.templateLiterals"]
+}
diff --git a/test/core/fixtures/transformation/es6-template-literals/single/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/single/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/single/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/single/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/single/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/single/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/single/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/single/expected.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/statement/actual.js b/test/core/fixtures/transformation/es6.spec.template-literals/statement/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/statement/actual.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/statement/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/statement/expected.js b/test/core/fixtures/transformation/es6.spec.template-literals/statement/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/statement/expected.js
rename to test/core/fixtures/transformation/es6.spec.template-literals/statement/expected.js
diff --git a/test/core/fixtures/transformation/es6.template-literals/escape-quotes/actual.js b/test/core/fixtures/transformation/es6.template-literals/escape-quotes/actual.js
new file mode 100644
index 0000000000..22b5aa1a4c
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/escape-quotes/actual.js
@@ -0,0 +1 @@
+var t = `'${foo}' "${bar}"`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/escape-quotes/expected.js b/test/core/fixtures/transformation/es6.template-literals/escape-quotes/expected.js
new file mode 100644
index 0000000000..b13235af59
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/escape-quotes/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var t = "'" + foo + "' \"" + bar + "\"";
diff --git a/test/core/fixtures/transformation/es6.template-literals/functions/actual.js b/test/core/fixtures/transformation/es6.template-literals/functions/actual.js
new file mode 100644
index 0000000000..6249f9ccd5
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/functions/actual.js
@@ -0,0 +1 @@
+var foo = `test ${_.test(foo)} ${bar}`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/functions/expected.js b/test/core/fixtures/transformation/es6.template-literals/functions/expected.js
new file mode 100644
index 0000000000..83df73bd85
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/functions/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var foo = "test " + _.test(foo) + " " + bar;
diff --git a/test/core/fixtures/transformation/es6.template-literals/multiline/actual.js b/test/core/fixtures/transformation/es6.template-literals/multiline/actual.js
new file mode 100644
index 0000000000..ac4e40cf3e
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/multiline/actual.js
@@ -0,0 +1,3 @@
+var o = `wow
+this is
+actually multiline!`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/multiline/expected.js b/test/core/fixtures/transformation/es6.template-literals/multiline/expected.js
new file mode 100644
index 0000000000..80999853d6
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/multiline/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var o = "wow\nthis is\nactually multiline!";
diff --git a/test/core/fixtures/transformation/es6.template-literals/multiple/actual.js b/test/core/fixtures/transformation/es6.template-literals/multiple/actual.js
new file mode 100644
index 0000000000..606790184d
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/multiple/actual.js
@@ -0,0 +1 @@
+var foo = `test ${foo} ${bar}`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/multiple/expected.js b/test/core/fixtures/transformation/es6.template-literals/multiple/expected.js
new file mode 100644
index 0000000000..664df108b0
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/multiple/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var foo = "test " + foo + " " + bar;
diff --git a/test/core/fixtures/transformation/es6.template-literals/none/actual.js b/test/core/fixtures/transformation/es6.template-literals/none/actual.js
new file mode 100644
index 0000000000..d979e5231f
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/none/actual.js
@@ -0,0 +1 @@
+var foo = `test`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/none/expected.js b/test/core/fixtures/transformation/es6.template-literals/none/expected.js
new file mode 100644
index 0000000000..5917e8e433
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/none/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var foo = "test";
diff --git a/test/core/fixtures/transformation/es6.template-literals/only/actual.js b/test/core/fixtures/transformation/es6.template-literals/only/actual.js
new file mode 100644
index 0000000000..1c4779e873
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/only/actual.js
@@ -0,0 +1 @@
+var foo = `${test}`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/only/expected.js b/test/core/fixtures/transformation/es6.template-literals/only/expected.js
new file mode 100644
index 0000000000..7fa1c086e7
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/only/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var foo = "" + test;
diff --git a/test/core/fixtures/transformation/es6.template-literals/single/actual.js b/test/core/fixtures/transformation/es6.template-literals/single/actual.js
new file mode 100644
index 0000000000..25815c8456
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/single/actual.js
@@ -0,0 +1 @@
+var foo = `test ${foo}`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/single/expected.js b/test/core/fixtures/transformation/es6.template-literals/single/expected.js
new file mode 100644
index 0000000000..1acf0454aa
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/single/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var foo = "test " + foo;
diff --git a/test/core/fixtures/transformation/es6.template-literals/statement/actual.js b/test/core/fixtures/transformation/es6.template-literals/statement/actual.js
new file mode 100644
index 0000000000..c7506efc90
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/statement/actual.js
@@ -0,0 +1 @@
+var foo = `test ${foo + bar}`;
diff --git a/test/core/fixtures/transformation/es6.template-literals/statement/expected.js b/test/core/fixtures/transformation/es6.template-literals/statement/expected.js
new file mode 100644
index 0000000000..ee58935944
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.template-literals/statement/expected.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var foo = "test " + (foo + bar);
diff --git a/test/core/fixtures/transformation/es6-template-literals/tag-loose/actual.js b/test/core/fixtures/transformation/es6.template-literals/tag-loose/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/tag-loose/actual.js
rename to test/core/fixtures/transformation/es6.template-literals/tag-loose/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/tag-loose/expected.js b/test/core/fixtures/transformation/es6.template-literals/tag-loose/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/tag-loose/expected.js
rename to test/core/fixtures/transformation/es6.template-literals/tag-loose/expected.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/tag-loose/options.json b/test/core/fixtures/transformation/es6.template-literals/tag-loose/options.json
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/tag-loose/options.json
rename to test/core/fixtures/transformation/es6.template-literals/tag-loose/options.json
diff --git a/test/core/fixtures/transformation/es6-template-literals/tag/actual.js b/test/core/fixtures/transformation/es6.template-literals/tag/actual.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/tag/actual.js
rename to test/core/fixtures/transformation/es6.template-literals/tag/actual.js
diff --git a/test/core/fixtures/transformation/es6-template-literals/tag/expected.js b/test/core/fixtures/transformation/es6.template-literals/tag/expected.js
similarity index 100%
rename from test/core/fixtures/transformation/es6-template-literals/tag/expected.js
rename to test/core/fixtures/transformation/es6.template-literals/tag/expected.js