From 4a3a851256483d438753b154d80d28c12c1d625c Mon Sep 17 00:00:00 2001 From: Khaidi Chu Date: Wed, 7 Nov 2018 14:21:51 +0800 Subject: [PATCH] fix: use <%- instead of <%= in user profile page (#1404) --- controllers/web/user/show.js | 4 +--- test/controllers/web/user/show.test.js | 6 ++++-- view/web/profile.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/controllers/web/user/show.js b/controllers/web/user/show.js index d496d2582..9a8dbe24c 100644 --- a/controllers/web/user/show.js +++ b/controllers/web/user/show.js @@ -22,9 +22,7 @@ module.exports = function* showUser(next) { var data = { name: name, - email: user.email ? he.encode(user.email, { - encodeEverything:true - }): user.email, + email: user.email ? he.encode(user.email, { encodeEverything: true }) : user.email, json: user.json || {}, isNpmUser: user.isNpmUser, }; diff --git a/test/controllers/web/user/show.test.js b/test/controllers/web/user/show.test.js index 038856044..33b99492c 100644 --- a/test/controllers/web/user/show.test.js +++ b/test/controllers/web/user/show.test.js @@ -77,10 +77,12 @@ describe('controllers/web/user/show.test.js', function () { .get('/~cnpmjstest10') .expect(200) .then(function (res) { - assert(res.text.includes("fengmk2@gmail.com") === false); + assert(res.text.includes('fengmk2@gmail.com') === false); + + // he.enclde('fengmk2@gmail.com') ↓ + assert(res.text.includes('fengmk2@gmail.com')); done() }); }); - }); }); diff --git a/view/web/profile.html b/view/web/profile.html index cc20387f3..386c1ae4e 100644 --- a/view/web/profile.html +++ b/view/web/profile.html @@ -14,7 +14,7 @@

<%= user.name %> <% } %> <% if (user.email) { %> - <<%= user.email %>> + <<%- user.email %>> <% } %> <% if (user.json.fullname) { %> (<%= user.json.fullname %>)