[NEW] Start running unit tests

.travis.yml

@@ -50,6 +50,7 @@ before_script:
 - |-
   mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
 - meteor npm run lint
+- meteor npm run testunit
 - meteor npm run stylelint
 - travis_retry meteor build --headless /tmp/build
 - mkdir /tmp/build-test

mocha.opts

@@ -0,0 +1,3 @@
+--compilers js:babel-mocha-es6-compiler
+--reporter spec
+--ui bdd

package.json

@@ -28,6 +28,15 @@
 		"name": "Sing Li",
 		"email": "[email protected]"
 	}],
+	"mocha": {
+		"tests": [
+			"packages/**/*.tests.js"
+		],
+		"files": [
+			"packages/**/*.js",
+			"!packages/**/*.tests.js"
+		]
+	},
 	"keywords": [
 		"rocketchat",
 		"rocket",
@@ -43,6 +52,9 @@
 		"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
 		"chimp-test": "chimp tests/chimp-config.js",
 		"postinstall": "cd packages/rocketchat-katex && npm i",
+		"testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+		"coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+		"testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
 		"version": "node .scripts/version.js",
 		"set-version": "node .scripts/set-version.js",
 		"release": "npm run set-version --silent"
@@ -57,11 +69,13 @@
 		"email": "[email protected]"
 	},
 	"devDependencies": {
+		"babel-mocha-es6-compiler": "^0.1.0",
+		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.49.0",
+		"conventional-changelog": "^1.1.3",
 		"eslint": "^3.19.0",
 		"stylelint": "^7.10.1",
-		"supertest": "^3.0.0",
-		"conventional-changelog": "^1.1.3"
+		"supertest": "^3.0.0"
 	},
 	"dependencies": {
 		"babel-runtime": "^6.23.0",

packages/rocketchat-mentions/Mentions.js

@@ -0,0 +1,65 @@
+/*
+* Mentions is a named function that will process Mentions
+* @param {Object} message - The message object
+*/
+import _ from 'underscore';
+export default class {
+	constructor({pattern, me}) {
+		this.pattern = pattern;
+		this.me = me;
+	}
+	set me(m) {
+		this._me = m;
+	}
+	get me() {
+		return typeof this._me === 'function' ? this._me() : this._me;
+	}
+	set pattern(p) {
+		this._pattern = p;
+	}
+	get pattern() {
+		return typeof this._pattern === 'function' ? this._pattern() : this._pattern;
+	}
+	get userMentionRegex() {
+		return new RegExp(`@(${ this.pattern })`, 'gm');
+	}
+	get channelMentionRegex() {
+		return new RegExp(`#(${ this.pattern })`, 'gm');
+	}
+	replaceUsers(str, message, me) {
+		return str.replace(this.userMentionRegex, (match, username) => {
+			if (['all', 'here'].includes(username)) {
+				return `<a class="mention-link mention-link-me mention-link-all background-attention-color">${ match }</a>`;
+			}
+
+			if (message.temp == null && _.findWhere(message.mentions, {username}) == null) {
+				return match;
+			}
+			return `<a class="mention-link ${ username === me ? 'mention-link-me background-primary-action-color':'' }" data-username="${ username }">${ match }</a>`;
+		});
+	}
+	replaceChannels(str, message) {
+		return str.replace(this.channelMentionRegex, (match, name) => {
+			if (message.temp == null && _.findWhere(message.channels, {name}) == null) {
+				return match;
+			}
+			return `<a class="mention-link" data-channel="${ name }">${ match }</a>`;
+		});
+	}
+	getUserMentions(str) {
+		return str.match(this.userMentionRegex) || [];
+	}
+	getChannelMentions(str) {
+		return str.match(this.channelMentionRegex) || [];
+	}
+	parse(message) {
+		let msg = (message && message.html) || '';
+		if (!msg.trim()) {
+			return message;
+		}
+		msg = this.replaceUsers(msg, message, this.me);
+		msg = this.replaceChannels(msg, message, this.me);
+		message.html = msg;
+		return message;
+	}
+}

packages/rocketchat-mentions/MentionsServer.js

@@ -0,0 +1,76 @@
+/*
+* Mentions is a named function that will process Mentions
+* @param {Object} message - The message object
+*/
+import Mentions from './Mentions';
+export default class MentionsServer extends Mentions {
+	constructor(args) {
+		super(args);
+		this.messageMaxAll = args.messageMaxAll;
+		this.getChannel = args.getChannel;
+		this.getChannels = args.getChannels;
+		this.getUsers = args.getUsers;
+	}
+	set getUsers(m) {
+		this._getUsers = m;
+	}
+	get getUsers() {
+		return typeof this._getUsers === 'function' ? this._getUsers : () => this._getUsers;
+	}
+	set getChannels(m) {
+		this._getChannels = m;
+	}
+	get getChannels() {
+		return typeof this._getChannels === 'function' ? this._getChannels : () => this._getChannels;
+	}
+	set getChannel(m) {
+		this._getChannel = m;
+	}
+	get getChannel() {
+		return typeof this._getChannel === 'function' ? this._getChannel : () => this._getChannel;
+	}
+	set messageMaxAll(m) {
+		this._messageMaxAll = m;
+	}
+	get messageMaxAll() {
+		return typeof this._messageMaxAll === 'function' ? this._messageMaxAll() : this._messageMaxAll;
+	}
+	getUsersByMentions({msg, rid}) {
+		let mentions = this.getUserMentions(msg);
+		const mentionsAll = [];
+		const userMentions = [];
+
+		mentions.forEach((m) => {
+			const mention = m.trim().substr(1);
+			if (mention !== 'all' && mention !== 'here') {
+				return userMentions.push(mention);
+			}
+			if (mention === 'all') {
+				const messageMaxAll = this.messageMaxAll;
+				const allChannel = this.getChannel(rid);
+				if (messageMaxAll !== 0 && allChannel.usernames.length >= messageMaxAll) {
+					return;
+				}
+			}
+			mentionsAll.push({
+				_id: mention,
+				username: mention
+			});
+		});
+		mentions = userMentions.length ? this.getUsers(userMentions) : [];
+		return [...mentionsAll, ...mentions];
+	}
+	getChannelbyMentions({msg}) {
+		const channels = this.getChannelMentions(msg);
+		return this.getChannels(channels.map(c => c.trim().substr(1)));
+	}
+	execute(message) {
+		const mentionsAll = this.getUsersByMentions(message);
+		const channels = this.getChannelbyMentions(message);
+
+		message.mentions = mentionsAll;
+
+		message.channels = channels;
+		return message;
+	}
+}

packages/rocketchat-mentions/client.js

@@ -1,41 +1,12 @@
-/*
- * Mentions is a named function that will process Mentions
- * @param {Object} message - The message object
- */
-
-function MentionsClient(message) {
-	let msg = (message && message.html) || '';
-	if (!msg.trim()) {
-		return message;
+import Mentions from './Mentions';
+const MentionsClient = new Mentions({
+	pattern() {
+		return RocketChat.settings.get('UTF8_Names_Validation');
+	},
+	me() {
+		const me = Meteor.user();
+		return me && me.username;
 	}
-	const msgMentionRegex = new RegExp(`(?:^|\\s|\\n)(@(${ RocketChat.settings.get('UTF8_Names_Validation') }):?)[:.,\s]?`, 'g');
-
-	let me = Meteor.user();
-	me = me ? me.username : null;
-
-	msg = msg.replace(msgMentionRegex, function(match, mention, username) {
-		if (['all', 'here'].includes(username)) {
-			return match.replace(mention, `<a class="mention-link mention-link-me mention-link-all background-attention-color">${ mention }</a>`);
-		}
-		if (message.temp == null && _.findWhere(message.mentions, {username}) == null) {
-			return match;
-		}
-		return match.replace(mention, `<a class="mention-link ${ username === me ? 'mention-link-me background-primary-action-color':'' }" data-username="${ username }">${ mention }</a>`);
-	});
-
-	const msgChannelRegex = new RegExp(`(?:^|\\s|\\n)(#(${ RocketChat.settings.get('UTF8_Names_Validation') }))[:.,\s]?`, 'g');
-
-	msg = msg.replace(msgChannelRegex, function(match, mention, name) {
-		if (message.temp == null && _.findWhere(message.channels, {name}) == null) {
-			return match;
-		}
-		return match.replace(mention, `<a class="mention-link" data-channel="${ name }">${ mention }</a>`);
-	});
-	message.html = msg;
-	return message;
-}
-
-
-RocketChat.callbacks.add('renderMessage', MentionsClient, RocketChat.callbacks.priority.MEDIUM, 'mentions-message');
-
-RocketChat.callbacks.add('renderMentions', MentionsClient, RocketChat.callbacks.priority.MEDIUM, 'mentions-mentions');
+});
+RocketChat.callbacks.add('renderMessage', (message) => MentionsClient.parse(message), RocketChat.callbacks.priority.MEDIUM, 'mentions-message');
+RocketChat.callbacks.add('renderMentions', (message) => MentionsClient.parse(message), RocketChat.callbacks.priority.MEDIUM, 'mentions-mentions');

packages/rocketchat-mentions/package.js

@@ -8,9 +8,11 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib'
+		'rocketchat:lib',
+		'underscore'
 	]);
 
 	api.addFiles('server.js', 'server');
 	api.addFiles('client.js', 'client');
+	// api.('mentions.js', 'client');
 });

packages/rocketchat-mentions/server.js

@@ -1,49 +1,9 @@
-/*
-* Mentions is a named function that will process Mentions
-* @param {Object} message - The message object
-*/
-
-function MentionsServer(message) {
-	const msgMentionRegex = new RegExp(`(?:^|\\s|\\n)(?:@)(${ RocketChat.settings.get('UTF8_Names_Validation') })`, 'g');
-	const mentionsAll = [];
-	const userMentions = [];
-	let mentions = message.msg.match(msgMentionRegex);
-	if (mentions) {
-		mentions.forEach((m) => {
-			const mention = m.trim().substr(1);
-			if (mention !== 'all' && mention !== 'here') {
-				return userMentions.push(mention);
-			}
-			if (mention === 'all') {
-				const messageMaxAll = RocketChat.settings.get('Message_MaxAll');
-				const allChannel = RocketChat.models.Rooms.findOneById(message.rid);
-				if (messageMaxAll !== 0 && allChannel.usernames.length >= messageMaxAll) {
-					return;
-				}
-			}
-			mentionsAll.push({
-				_id: mention,
-				username: mention
-			});
-		});
-		mentions = userMentions.length ? Meteor.users.find({ username: {$in: _.unique(userMentions)}}, { fields: {_id: true, username: true }}).fetch() : [];
-
-		const verifiedMentions = [...mentionsAll, ...mentions];
-		if (verifiedMentions.length !== 0) {
-			message.mentions = verifiedMentions;
-		}
-	}
-
-	const msgChannelRegex = new RegExp(`(?:^|\\s|\\n)(?:#)(${ RocketChat.settings.get('UTF8_Names_Validation') })`, 'g');
-	let channels = message.msg.match(msgChannelRegex);
-	if (channels) {
-		channels = channels.map(c => c.trim().substr(1));
-		const verifiedChannels = RocketChat.models.Rooms.find({ name: {$in: _.unique(channels)}, t: 'c'	}, { fields: {_id: 1, name: 1 }}).fetch();
-		if (verifiedChannels.length !== 0) {
-			message.channels = verifiedChannels;
-		}
-	}
-	return message;
-}
-
-RocketChat.callbacks.add('beforeSaveMessage', MentionsServer, RocketChat.callbacks.priority.HIGH, 'mentions');
+import MentionsServer from './MentionsServer';
+const mention = new MentionsServer({
+	pattern: () => RocketChat.settings.get('UTF8_Names_Validation'),
+	messageMaxAll: () => RocketChat.settings.get('Message_MaxAll'),
+	getUsers: (usernames) => Meteor.users.find({ username: {$in: _.unique(usernames)}}, { fields: {_id: true, username: true }}).fetch(),
+	getChannel: (rid) => RocketChat.models.Rooms.findOneById(rid),
+	getChannels: (channels) => RocketChat.models.Rooms.find({ name: {$in: _.unique(channels)}, t: 'c'	}, { fields: {_id: 1, name: 1 }}).fetch()
+});
+RocketChat.callbacks.add('beforeSaveMessage', (message) => mention.execute(message), RocketChat.callbacks.priority.HIGH, 'mentions');