From b6d6f4fdad7dd44f1a9e48c82f45bcf8bd4a5285 Mon Sep 17 00:00:00 2001 From: Patrick Steele-Idem Date: Tue, 22 Dec 2015 10:54:25 -0700 Subject: [PATCH] Improved tests for the var tag --- test/fixtures/render/autotest/var-scoped/expected.html | 1 + test/fixtures/render/autotest/var-scoped/template.marko | 6 ++++++ .../render/autotest/{var-tag => var-scoped}/test.js | 0 test/fixtures/render/autotest/var-tag/expected.html | 1 - test/fixtures/render/autotest/var-tag/template.marko | 8 -------- test/fixtures/render/autotest/var/expected.html | 1 + test/fixtures/render/autotest/var/template.marko | 3 +++ test/fixtures/render/autotest/var/test.js | 1 + 8 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 test/fixtures/render/autotest/var-scoped/expected.html create mode 100644 test/fixtures/render/autotest/var-scoped/template.marko rename test/fixtures/render/autotest/{var-tag => var-scoped}/test.js (100%) delete mode 100644 test/fixtures/render/autotest/var-tag/expected.html delete mode 100644 test/fixtures/render/autotest/var-tag/template.marko create mode 100644 test/fixtures/render/autotest/var/expected.html create mode 100644 test/fixtures/render/autotest/var/template.marko create mode 100644 test/fixtures/render/autotest/var/test.js diff --git a/test/fixtures/render/autotest/var-scoped/expected.html b/test/fixtures/render/autotest/var-scoped/expected.html new file mode 100644 index 000000000..f163a1a1b --- /dev/null +++ b/test/fixtures/render/autotest/var-scoped/expected.html @@ -0,0 +1 @@ +1711undefined \ No newline at end of file diff --git a/test/fixtures/render/autotest/var-scoped/template.marko b/test/fixtures/render/autotest/var-scoped/template.marko new file mode 100644 index 000000000..39a97edf1 --- /dev/null +++ b/test/fixtures/render/autotest/var-scoped/template.marko @@ -0,0 +1,6 @@ + + ${x} + ${y} + ${z} + +${typeof x} \ No newline at end of file diff --git a/test/fixtures/render/autotest/var-tag/test.js b/test/fixtures/render/autotest/var-scoped/test.js similarity index 100% rename from test/fixtures/render/autotest/var-tag/test.js rename to test/fixtures/render/autotest/var-scoped/test.js diff --git a/test/fixtures/render/autotest/var-tag/expected.html b/test/fixtures/render/autotest/var-tag/expected.html deleted file mode 100644 index 7b8cb1338..000000000 --- a/test/fixtures/render/autotest/var-tag/expected.html +++ /dev/null @@ -1 +0,0 @@ -FRANK 36501711 \ No newline at end of file diff --git a/test/fixtures/render/autotest/var-tag/template.marko b/test/fixtures/render/autotest/var-tag/template.marko deleted file mode 100644 index cb20a1b69..000000000 --- a/test/fixtures/render/autotest/var-tag/template.marko +++ /dev/null @@ -1,8 +0,0 @@ - - -${name.toUpperCase()} ${age*365} - - ${x} - ${y} - ${z} - \ No newline at end of file diff --git a/test/fixtures/render/autotest/var/expected.html b/test/fixtures/render/autotest/var/expected.html new file mode 100644 index 000000000..7ef5e2f97 --- /dev/null +++ b/test/fixtures/render/autotest/var/expected.html @@ -0,0 +1 @@ +FRANK 3650 \ No newline at end of file diff --git a/test/fixtures/render/autotest/var/template.marko b/test/fixtures/render/autotest/var/template.marko new file mode 100644 index 000000000..8029abb9c --- /dev/null +++ b/test/fixtures/render/autotest/var/template.marko @@ -0,0 +1,3 @@ + + +${name.toUpperCase()} ${age*365} \ No newline at end of file diff --git a/test/fixtures/render/autotest/var/test.js b/test/fixtures/render/autotest/var/test.js new file mode 100644 index 000000000..c4013b344 --- /dev/null +++ b/test/fixtures/render/autotest/var/test.js @@ -0,0 +1 @@ +exports.templateData = {};