|
|
|
'use strict';
|
|
|
|
|
|
|
|
const nconf = require('nconf');
|
|
|
|
const assert = require('assert');
|
|
|
|
|
|
|
|
const db = require('./mocks/databasemock');
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
const helpers = require('../src/helpers');
|
|
|
|
|
|
|
|
describe('helpers', () => {
|
|
|
|
it('should return false if item doesn\'t exist', (done) => {
|
|
|
|
const flag = helpers.displayMenuItem({ navigation: [] }, 0);
|
|
|
|
assert(!flag);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return false if route is /users and user does not have view:users privilege', (done) => {
|
|
|
|
const flag = helpers.displayMenuItem({
|
|
|
|
navigation: [{ route: '/users' }],
|
|
|
|
user: {
|
|
|
|
privileges: {
|
|
|
|
'view:users': false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}, 0);
|
|
|
|
assert(!flag);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return false if route is /tags and user does not have view:tags privilege', (done) => {
|
|
|
|
const flag = helpers.displayMenuItem({
|
|
|
|
navigation: [{ route: '/tags' }],
|
|
|
|
user: {
|
|
|
|
privileges: {
|
|
|
|
'view:tags': false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}, 0);
|
|
|
|
assert(!flag);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return false if route is /groups and user does not have view:groups privilege', (done) => {
|
|
|
|
const flag = helpers.displayMenuItem({
|
|
|
|
navigation: [{ route: '/groups' }],
|
|
|
|
user: {
|
|
|
|
privileges: {
|
|
|
|
'view:groups': false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}, 0);
|
|
|
|
assert(!flag);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should stringify object', (done) => {
|
|
|
|
const str = helpers.stringify({ a: 'herp < derp > and & quote "' });
|
|
|
|
assert.equal(str, '{"a":"herp < derp > and & quote \\""}');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should escape html', (done) => {
|
|
|
|
const str = helpers.escape('gdkfhgk < some > and &');
|
|
|
|
assert.equal(str, 'gdkfhgk < some > and &');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return empty string if category is falsy', (done) => {
|
|
|
|
assert.equal(helpers.generateCategoryBackground(null), '');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should generate category background', (done) => {
|
|
|
|
const category = {
|
|
|
|
bgColor: '#ff0000',
|
|
|
|
color: '#00ff00',
|
|
|
|
backgroundImage: '/assets/uploads/image.png',
|
|
|
|
imageClass: 'auto',
|
|
|
|
};
|
|
|
|
const bg = helpers.generateCategoryBackground(category);
|
|
|
|
assert.equal(bg, 'background-color: #ff0000; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto;');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return empty string if category has no children', (done) => {
|
|
|
|
const category = {
|
|
|
|
children: [],
|
|
|
|
};
|
|
|
|
const bg = helpers.generateChildrenCategories(category);
|
|
|
|
assert.equal(bg, '');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should generate html for children', (done) => {
|
|
|
|
const category = {
|
|
|
|
children: [
|
|
|
|
{
|
|
|
|
link: '',
|
|
|
|
bgColor: '#ff0000',
|
|
|
|
color: '#00ff00',
|
|
|
|
name: 'children',
|
|
|
|
},
|
|
|
|
],
|
|
|
|
};
|
|
|
|
const html = helpers.generateChildrenCategories(category);
|
|
|
|
assert.equal(html, `<span class="category-children"><span class="category-children-item pull-left"><div role="presentation" class="icon pull-left" style="background-color: #ff0000; color: #00ff00;"><i class="fa fa-fw undefined"></i></div><a href="${nconf.get('relative_path')}/category/undefined"><small>children</small></a></span></span>`);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should generate topic class', (done) => {
|
|
|
|
const className = helpers.generateTopicClass({ locked: true, pinned: true, deleted: true, unread: true });
|
|
|
|
assert.equal(className, 'locked pinned deleted unread');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should show leave button if isMember and group is not administrators', (done) => {
|
|
|
|
const btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', isMember: true });
|
|
|
|
assert.equal(btn, '<button class="btn btn-danger" data-action="leave" data-group="some group"><i class="fa fa-times"></i> [[groups:membership.leave-group]]</button>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should show pending button if isPending and group is not administrators', (done) => {
|
|
|
|
const btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', isPending: true });
|
|
|
|
assert.equal(btn, '<button class="btn btn-warning disabled"><i class="fa fa-clock-o"></i> [[groups:membership.invitation-pending]]</button>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should show reject invite button if isInvited', (done) => {
|
|
|
|
const btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', isInvited: true });
|
|
|
|
assert.equal(btn, '<button class="btn btn-link" data-action="rejectInvite" data-group="some group">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="some group"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should show join button if join requests are not disabled and group is not administrators', (done) => {
|
|
|
|
const btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', disableJoinRequests: false });
|
|
|
|
assert.equal(btn, '<button class="btn btn-success" data-action="join" data-group="some group"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should show nothing if group is administrators ', (done) => {
|
|
|
|
const btn = helpers.membershipBtn({ displayName: 'administrators', name: 'administrators' });
|
|
|
|
assert.equal(btn, '');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should spawn privilege states', (done) => {
|
|
|
|
const privs = {
|
|
|
|
find: true,
|
|
|
|
read: true,
|
|
|
|
};
|
|
|
|
const html = helpers.spawnPrivilegeStates('guests', privs);
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
assert.equal(html, '<td class="text-center" data-privilege="find" data-value="true"><input autocomplete="off" type="checkbox" checked /></td><td class="text-center" data-privilege="read" data-value="true"><input autocomplete="off" type="checkbox" checked /></td>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should render thumb as topic image', (done) => {
|
|
|
|
const topicObj = { thumb: '/uploads/1.png', user: { username: 'baris' } };
|
|
|
|
const html = helpers.renderTopicImage(topicObj);
|
|
|
|
assert.equal(html, `<img src="${topicObj.thumb}" class="img-circle user-img" title="${topicObj.user.username}" />`);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should render user picture as topic image', (done) => {
|
|
|
|
const topicObj = { thumb: '', user: { uid: 1, username: 'baris', picture: '/uploads/2.png' } };
|
|
|
|
const html = helpers.renderTopicImage(topicObj);
|
|
|
|
assert.equal(html, `<img component="user/picture" data-uid="${topicObj.user.uid}" src="${topicObj.user.picture}" class="user-img" title="${topicObj.user.username}" />`);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should render digest avatar', (done) => {
|
|
|
|
const block = { teaser: { user: { username: 'baris', picture: '/uploads/1.png' } } };
|
|
|
|
const html = helpers.renderDigestAvatar(block);
|
|
|
|
assert.equal(html, `<img style="vertical-align: middle; width: 32px; height: 32px; border-radius: 50%;" src="${block.teaser.user.picture}" title="${block.teaser.user.username}" />`);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should render digest avatar', (done) => {
|
|
|
|
const block = { teaser: { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } } };
|
|
|
|
const html = helpers.renderDigestAvatar(block);
|
|
|
|
assert.equal(html, `<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; background-color: ${block.teaser.user['icon:bgColor']}; color: white; text-align: center; display: inline-block; border-radius: 50%;">${block.teaser.user['icon:text']}</div>`);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should render digest avatar', (done) => {
|
|
|
|
const block = { user: { username: 'baris', picture: '/uploads/1.png' } };
|
|
|
|
const html = helpers.renderDigestAvatar(block);
|
|
|
|
assert.equal(html, `<img style="vertical-align: middle; width: 32px; height: 32px; border-radius: 50%;" src="${block.user.picture}" title="${block.user.username}" />`);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should render digest avatar', (done) => {
|
|
|
|
const block = { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } };
|
|
|
|
const html = helpers.renderDigestAvatar(block);
|
|
|
|
assert.equal(html, `<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; background-color: ${block.user['icon:bgColor']}; color: white; text-align: center; display: inline-block; border-radius: 50%;">${block.user['icon:text']}</div>`);
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('shoud render user agent/browser icons', (done) => {
|
|
|
|
const html = helpers.userAgentIcons({ platform: 'Linux', browser: 'Chrome' });
|
|
|
|
assert.equal(html, '<i class="fa fa-fw fa-linux"></i><i class="fa fa-fw fa-chrome"></i>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('shoud render user agent/browser icons', (done) => {
|
|
|
|
const html = helpers.userAgentIcons({ platform: 'Microsoft Windows', browser: 'Firefox' });
|
|
|
|
assert.equal(html, '<i class="fa fa-fw fa-windows"></i><i class="fa fa-fw fa-firefox"></i>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('shoud render user agent/browser icons', (done) => {
|
|
|
|
const html = helpers.userAgentIcons({ platform: 'Apple Mac', browser: 'Safari' });
|
|
|
|
assert.equal(html, '<i class="fa fa-fw fa-apple"></i><i class="fa fa-fw fa-safari"></i>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('shoud render user agent/browser icons', (done) => {
|
|
|
|
const html = helpers.userAgentIcons({ platform: 'Android', browser: 'IE' });
|
|
|
|
assert.equal(html, '<i class="fa fa-fw fa-android"></i><i class="fa fa-fw fa-internet-explorer"></i>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('shoud render user agent/browser icons', (done) => {
|
|
|
|
const html = helpers.userAgentIcons({ platform: 'iPad', browser: 'Edge' });
|
|
|
|
assert.equal(html, '<i class="fa fa-fw fa-tablet"></i><i class="fa fa-fw fa-edge"></i>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('shoud render user agent/browser icons', (done) => {
|
|
|
|
const html = helpers.userAgentIcons({ platform: 'iPhone', browser: 'unknow' });
|
|
|
|
assert.equal(html, '<i class="fa fa-fw fa-mobile"></i><i class="fa fa-fw fa-question-circle"></i>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('shoud render user agent/browser icons', (done) => {
|
|
|
|
const html = helpers.userAgentIcons({ platform: 'unknow', browser: 'unknown' });
|
|
|
|
assert.equal(html, '<i class="fa fa-fw fa-question-circle"></i><i class="fa fa-fw fa-question-circle"></i>');
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
});
|