From c93dcd24ee2a8533bd9fae703398dfe2973c657f Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Tue, 25 May 2021 15:48:30 +0200 Subject: [PATCH] add #3 --- src/modules/engine.js | 2 +- test/test.js | 75 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/src/modules/engine.js b/src/modules/engine.js index 03a6442..0de6a7b 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -24,7 +24,7 @@ app.render = function (pagecode, templatecode) { for (var i in pagecode) { var value = undefined; - var re = new RegExp(/\d*_([A-Z])\w*_/g); + var re = new RegExp(/\d*_([A-Z]|[a-z])\w*_/g); if (re.test(i)) continue; value = pagecode[i].toString(); diff --git a/test/test.js b/test/test.js index eb027d0..90ed9b0 100644 --- a/test/test.js +++ b/test/test.js @@ -1,13 +1,70 @@ const JSTE = require("../"); -var assert = require('assert'); -var expect = require('chai').expect; -var should = require('chai').should(); +var assert = require("assert"); +var expect = require("chai").expect; +var should = require("chai").should(); -describe('test VARS', function() { - it('should retrun EXAMPLE', function() { - var result = JSTE.render({'VAR':'EXAMPLE'},"<[VAR]>"); - result.should.equal("EXAMPLE"); - }); +describe("test var rendering", function () { + it("should retrun EXAMPLE", function () { + var result = JSTE.render({ VAR: "EXAMPLE" }, "<[VAR]>"); + result.should.equal("EXAMPLE"); + }); + it("should retrun EXAMPLEEXAMPLE", function () { + var result = JSTE.render({ VAR: "EXAMPLE" }, "<[VAR]><[VAR]>"); + result.should.equal("EXAMPLEEXAMPLE"); + }); + it("should retrun EXAMPLE EXAMPLE", function () { + var result = JSTE.render({ VAR: "EXAMPLE" }, "<[VAR]> <[VAR]>"); + result.should.equal("EXAMPLE EXAMPLE"); + }); + it("should delete useless var", function () { + var result = JSTE.render({ VAR: "EXAMPLE" }, "<[VAR]><[VAR2]><[VAR]>"); + result.should.equal("EXAMPLEEXAMPLE"); + }); + it("should render in HTML tag", function () { + var result = JSTE.render({ VAR: "EXAMPLE" }, "<[VAR]>"); + result.should.equal("EXAMPLE"); + }); + it("should render in href a tag", function () { + var result = JSTE.render({ LINK: "www.nodejs.com" }, ""); + result.should.equal(""); }); -console.log() \ No newline at end of file + it("should render a tag", function () { + var result = JSTE.render({VAR: "EXAMPLE", LINK: "www.nodejs.com" }, "<[VAR]>"); + result.should.equal("EXAMPLE"); + }); +}); + +describe("test Varnames",function (){ + it("should render varname: VAR", function () { + var result = JSTE.render({ VAR: "EXAMPLE" }, "<[VAR]>"); + result.should.equal("EXAMPLE"); + }); + it("should render varname: Var", function () { + var result = JSTE.render({ Var: "EXAMPLE" }, "<[Var]>"); + result.should.equal("EXAMPLE"); + }); + it("should render varname: vAr", function () { + var result = JSTE.render({ vAr: "EXAMPLE" }, "<[vAr]>"); + result.should.equal("EXAMPLE"); + }); + it("should render varname: vaR", function () { + var result = JSTE.render({ vaR: "EXAMPLE" }, "<[vaR]>"); + result.should.equal("EXAMPLE"); + }); + it("should render varname: var", function () { + var result = JSTE.render({ var: "EXAMPLE" }, "<[var]>"); + result.should.equal("EXAMPLE"); + }); + it("should not rende _VAR_", function () { + var result = JSTE.render({ _VAR_: "EXAMPLE" }, "<[_VAR_]>"); + result.should.equal("<[_VAR_]>"); + }); + it("should not render _var_", function () { + var result = JSTE.render({ _var_: "EXAMPLE" }, "<[_var_]>"); + result.should.equal("<[_var_]>"); + }); +}) + + +console.log();