[[admin/settings/post:restrictions]]
+
+
[[admin/settings/post:restrictions-new]]
+
+
+
+[[admin/settings/post:timestamp]]
diff --git a/src/views/emails/digest.tpl b/src/views/emails/digest.tpl
index 3a50fded7a..38fba1232f 100644
--- a/src/views/emails/digest.tpl
+++ b/src/views/emails/digest.tpl
@@ -16,22 +16,22 @@
| + |
[[email:greeting_with_name, {username}]], |
| + |
[[email:digest.notifications, {site_title}]] |
| + |
[[email:digest.latest_topics, {site_title}]]
' + block.teaser.user['icon:text'] + ' ');
+ assert.equal(html, '' + block.teaser.user['icon:text'] + ' ');
done();
});
it('should render digest avatar', function (done) {
var block = { user: { username: 'baris', picture: '/uploads/1.png' } };
var html = helpers.renderDigestAvatar(block);
- assert.equal(html, '' + block.user['icon:text'] + ' ');
+ assert.equal(html, '' + block.user['icon:text'] + ' ');
done();
});
diff --git a/test/topics.js b/test/topics.js
index e6c341cb9e..f4d91ad763 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -1699,4 +1699,90 @@ describe('Topic\'s', function () {
});
});
});
+
+ describe('topic merge', function () {
+ var uid;
+ var topic1Data;
+ var topic2Data;
+
+ before(function (done) {
+ async.waterfall([
+ function (next) {
+ User.create({ username: 'mergevictim' }, next);
+ },
+ function (_uid, next) {
+ uid = _uid;
+ topics.post({ uid: uid, cid: categoryObj.cid, title: 'topic 1', content: 'topic 1 OP' }, next);
+ },
+ function (result, next) {
+ topic1Data = result.topicData;
+ topics.post({ uid: uid, cid: categoryObj.cid, title: 'topic 2', content: 'topic 2 OP' }, next);
+ },
+ function (result, next) {
+ topic2Data = result.topicData;
+ topics.reply({ uid: uid, content: 'topic 1 reply', tid: topic1Data.tid }, next);
+ },
+ function (postData, next) {
+ topics.reply({ uid: uid, content: 'topic 2 reply', tid: topic2Data.tid }, next);
+ },
+ ], done);
+ });
+
+ it('should error if data is not an array', function (done) {
+ socketTopics.merge({ uid: 0 }, null, function (err) {
+ assert.equal(err.message, '[[error:invalid-data]]');
+ done();
+ });
+ });
+
+ it('should error if user does not have privileges', function (done) {
+ socketTopics.merge({ uid: 0 }, [topic2Data.tid, topic1Data.tid], function (err) {
+ assert.equal(err.message, '[[error:no-privileges]]');
+ done();
+ });
+ });
+
+ it('should merge 2 topics', function (done) {
+ async.waterfall([
+ function (next) {
+ socketTopics.merge({ uid: adminUid }, [topic2Data.tid, topic1Data.tid], next);
+ },
+ function (next) {
+ async.parallel({
+ topic1: function (next) {
+ async.waterfall([
+ function (next) {
+ topics.getTopicData(topic1Data.tid, next);
+ },
+ function (topicData, next) {
+ topics.getTopicWithPosts(topicData, 'tid:' + topicData.tid + ':posts', adminUid, 0, 19, false, next);
+ },
+ ], next);
+ },
+ topic2: function (next) {
+ async.waterfall([
+ function (next) {
+ topics.getTopicData(topic2Data.tid, next);
+ },
+ function (topicData, next) {
+ topics.getTopicWithPosts(topicData, 'tid:' + topicData.tid + ':posts', adminUid, 0, 19, false, next);
+ },
+ ], next);
+ },
+ }, next);
+ },
+ function (results, next) {
+ assert.equal(results.topic1.posts.length, 4);
+ assert.equal(results.topic2.posts.length, 0);
+ assert.equal(results.topic2.deleted, true);
+
+ assert.equal(results.topic1.posts[0].content, 'topic 1 OP');
+ assert.equal(results.topic1.posts[1].content, 'topic 2 OP');
+ assert.equal(results.topic1.posts[2].content, 'topic 1 reply');
+ assert.equal(results.topic1.posts[3].content, 'topic 2 reply');
+ next();
+ },
+ ], done);
+ });
+ });
});
diff --git a/test/user.js b/test/user.js
index 0135c339b2..82046c525a 100644
--- a/test/user.js
+++ b/test/user.js
@@ -1405,7 +1405,7 @@ describe('User', function () {
username: 'rejectme',
password: '123456',
'password-confirm': '123456',
- email: 'reject@me.com',
+ email: '', function (err) {
+ assert.ifError(err);
+ User.getInvites(inviterUid, function (err, data) {
+ assert.ifError(err);
+ assert.equal(data[0], '<script>alert("ok");</script>');
+ done();
+ });
+ });
+ });
});
describe('email confirm', function () {
|