Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-01-09 14:52:48 +01:00
commit f431bce2dc
3 changed files with 29 additions and 24 deletions

View File

@ -1,5 +1,5 @@
define("transcripts", [
"tpl!converse-logs/double_logins",
"tpl!../../converse-logs/missing_messages",
], function () {
return arguments;
});

View File

@ -1,14 +1,15 @@
(function (root, factory) {
define([
"jquery",
"jasmine",
"converse-core",
"mock",
"test_utils",
"test-utils",
"utils",
"transcripts"
], factory
);
} (this, function ($, converse, mock, test_utils, utils, transcripts) {
} (this, function ($, jasmine, converse, mock, test_utils, utils, transcripts) {
var Strophe = converse.env.Strophe;
var _ = converse.env._;
var IGNORED_TAGS = [
@ -48,28 +49,32 @@
return describe("Transcripts of chat logs", function () {
it("can be used to replay conversations", mock.initConverse(function (_converse) {
/*
test_utils.openAndEnterChatRoom(_converse, "dummy", 'rooms.localhost', 'jc');
test_utils.openAndEnterChatRoom(_converse, "prosody", 'conference.prosody.im', 'jc');
*/
test_utils.openAndEnterChatRoom(_converse, "discuss", 'conference.conversejs.org', 'jc');
spyOn(_converse, 'areDesktopNotificationsEnabled').andReturn(true);
_.each(transcripts, function (transcript) {
var text = transcript();
var xml = Strophe.xmlHtmlNode(text);
$(xml).children('log').children('body').each(function (i, el) {
$(el).children().each(function (i, el) {
if (el.nodeType === 3) {
return; // Ignore text
}
if (_.includes(IGNORED_TAGS, el.nodeName.toLowerCase())) {
return;
}
var _stanza = traverseElement(el);
_converse.connection._dataRecv(test_utils.createRequest(_stanza));
it("can be used to replay conversations",
mock.initConverseWithPromises(
null, ['rosterGroupsFetched'], {},
function (done, _converse) {
_converse.allow_non_roster_messaging = true;
test_utils.openAndEnterChatRoom(_converse, 'discuss', 'conference.conversejs.org', 'dummy').then(function () {
spyOn(_converse, 'areDesktopNotificationsEnabled').and.returnValue(true);
_.each(transcripts, function (transcript) {
var text = transcript();
var xml = Strophe.xmlHtmlNode(text);
_.each(xml.firstElementChild.children, function (el) {
_.each(el.children, function (el) {
if (el.nodeType === 3) {
return; // Ignore text
}
if (_.includes(IGNORED_TAGS, el.nodeName.toLowerCase())) {
return;
}
var _stanza = traverseElement(el);
_converse.connection._dataRecv(test_utils.createRequest(_stanza));
});
});
});
done();
});
}));
});

View File

@ -30,8 +30,8 @@ config.shim.jasmine = {
require.config(config);
var specs = [
//"spec/transcripts",
"jasmine",
//"spec/transcripts",
"spec/profiling",
"spec/utils",
"spec/converse",