Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 12:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-03-24 15:52:58 -04:00
parent b649eb95f8 a1f87a5d7f
commit 0e157d93ea
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/api.js
View File

@@ -73,9 +73,9 @@ apiController.getConfig = function (req, res, next) {
config.cookies = {
enabled: parseInt(meta.config.cookieConsentEnabled, 10) === 1,
message: translator.escape(validator.escape(meta.config.cookieConsentMessage) || '[[global:cookies.message]]').replace(/\\/g, '\\\\'),
dismiss: translator.escape(validator.escape(meta.config.cookieConsentDismiss) || '[[global:cookies.accept]]').replace(/\\/g, '\\\\'),
link: translator.escape(validator.escape(meta.config.cookieConsentLink) || '[[global:cookies.learn_more]]').replace(/\\/g, '\\\\'),
message: translator.escape(validator.escape(meta.config.cookieConsentMessage || '[[global:cookies.message]]')).replace(/\\/g, '\\\\'),
dismiss: translator.escape(validator.escape(meta.config.cookieConsentDismiss || '[[global:cookies.accept]]')).replace(/\\/g, '\\\\'),
link: translator.escape(validator.escape(meta.config.cookieConsentLink || '[[global:cookies.learn_more]]')).replace(/\\/g, '\\\\'),
};
async.waterfall([

44
test/controllers.js
View File

@@ -1017,6 +1017,50 @@ describe('Controllers', function () {
});
});
describe('cookie consent', function () {
it('should return relevant data in configs API route', function (done) {
request(nconf.get('url') + '/api/config', function (err, res, body) {
var parsed;
assert.ifError(err);
assert.equal(res.statusCode, 200);
try {
parsed = JSON.parse(body);
} catch (e) {
assert.ifError(e);
}
assert.ok(parsed.cookies);
assert.equal('\\\\[\\\\[global:cookies.message\\\\]\\\\]', parsed.cookies.message);
assert.equal('\\\\[\\\\[global:cookies.accept\\\\]\\\\]', parsed.cookies.dismiss);
assert.equal('\\\\[\\\\[global:cookies.learn_more\\\\]\\\\]', parsed.cookies.link);
done();
});
});
it('response should be parseable when entries have apostrophes', function (done) {
meta.configs.set('cookieConsentMessage', 'Julian\'s Message', function (err) {
assert.ifError(err);
request(nconf.get('url') + '/api/config', function (err, res, body) {
var parsed;
assert.ifError(err);
assert.equal(res.statusCode, 200);
try {
parsed = JSON.parse(body);
} catch (e) {
assert.ifError(e);
}
assert.equal('Julian's Message', parsed.cookies.message);
done();
});
});
});
});
after(function (done) {
var analytics = require('../src/analytics');
analytics.writeData(function (err) {