From b54c9da89cdfb4f338a4ffded456d57dfa38b5e0 Mon Sep 17 00:00:00 2001 From: Patrick Steele-Idem Date: Tue, 19 Jan 2016 16:29:59 -0700 Subject: [PATCH] Marko v3: Moved over tests related to require (now template-init) --- taglibs/core/template-init-tag.js | 1 + test/fixtures/compiler/autotest/template-init/expected.js | 2 +- .../dynamic-tag-name/expected.html | 0 .../dynamic-tag-name/template.marko | 0 .../{autotest-pending => autotest}/dynamic-tag-name/test.js | 0 .../{autotest-pending => autotest}/require/expected.html | 0 .../{autotest-pending => autotest}/require/template.marko | 5 ++++- .../{autotest-pending => autotest}/require/test-helpers.js | 0 .../render/{autotest-pending => autotest}/require/test.js | 0 9 files changed, 6 insertions(+), 2 deletions(-) rename test/fixtures/render/{autotest-pending => autotest}/dynamic-tag-name/expected.html (100%) rename test/fixtures/render/{autotest-pending => autotest}/dynamic-tag-name/template.marko (100%) rename test/fixtures/render/{autotest-pending => autotest}/dynamic-tag-name/test.js (100%) rename test/fixtures/render/{autotest-pending => autotest}/require/expected.html (100%) rename test/fixtures/render/{autotest-pending => autotest}/require/template.marko (50%) rename test/fixtures/render/{autotest-pending => autotest}/require/test-helpers.js (100%) rename test/fixtures/render/{autotest-pending => autotest}/require/test.js (100%) diff --git a/taglibs/core/template-init-tag.js b/taglibs/core/template-init-tag.js index e3b0c8253..6f4ec40a7 100644 --- a/taglibs/core/template-init-tag.js +++ b/taglibs/core/template-init-tag.js @@ -2,5 +2,6 @@ module.exports = function codeGenerator(elNode, codegen) { var bodyText = elNode.bodyText; + elNode.noOutput = true; codegen.addStaticCode(bodyText); }; \ No newline at end of file diff --git a/test/fixtures/compiler/autotest/template-init/expected.js b/test/fixtures/compiler/autotest/template-init/expected.js index 7466df751..349e4159f 100644 --- a/test/fixtures/compiler/autotest/template-init/expected.js +++ b/test/fixtures/compiler/autotest/template-init/expected.js @@ -7,7 +7,7 @@ function create(__helpers) { var name = '${name}
'; return function render(data, out) { - out.w(" Hello " + + out.w("Hello " + escapeXml(name) + "!"); }; diff --git a/test/fixtures/render/autotest-pending/dynamic-tag-name/expected.html b/test/fixtures/render/autotest/dynamic-tag-name/expected.html similarity index 100% rename from test/fixtures/render/autotest-pending/dynamic-tag-name/expected.html rename to test/fixtures/render/autotest/dynamic-tag-name/expected.html diff --git a/test/fixtures/render/autotest-pending/dynamic-tag-name/template.marko b/test/fixtures/render/autotest/dynamic-tag-name/template.marko similarity index 100% rename from test/fixtures/render/autotest-pending/dynamic-tag-name/template.marko rename to test/fixtures/render/autotest/dynamic-tag-name/template.marko diff --git a/test/fixtures/render/autotest-pending/dynamic-tag-name/test.js b/test/fixtures/render/autotest/dynamic-tag-name/test.js similarity index 100% rename from test/fixtures/render/autotest-pending/dynamic-tag-name/test.js rename to test/fixtures/render/autotest/dynamic-tag-name/test.js diff --git a/test/fixtures/render/autotest-pending/require/expected.html b/test/fixtures/render/autotest/require/expected.html similarity index 100% rename from test/fixtures/render/autotest-pending/require/expected.html rename to test/fixtures/render/autotest/require/expected.html diff --git a/test/fixtures/render/autotest-pending/require/template.marko b/test/fixtures/render/autotest/require/template.marko similarity index 50% rename from test/fixtures/render/autotest-pending/require/template.marko rename to test/fixtures/render/autotest/require/template.marko index 475a7a628..31193ddac 100644 --- a/test/fixtures/render/autotest-pending/require/template.marko +++ b/test/fixtures/render/autotest/require/template.marko @@ -1,3 +1,6 @@ - + + var testHelpers = require('./test-helpers') + + Hello ${testHelpers.upperCase("world")}! Hello ${testHelpers.trim(" World ")}! \ No newline at end of file diff --git a/test/fixtures/render/autotest-pending/require/test-helpers.js b/test/fixtures/render/autotest/require/test-helpers.js similarity index 100% rename from test/fixtures/render/autotest-pending/require/test-helpers.js rename to test/fixtures/render/autotest/require/test-helpers.js diff --git a/test/fixtures/render/autotest-pending/require/test.js b/test/fixtures/render/autotest/require/test.js similarity index 100% rename from test/fixtures/render/autotest-pending/require/test.js rename to test/fixtures/render/autotest/require/test.js