Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
502d2aa064
xmpp.chapril.org-conversejs/spec/http-file-upload.js

663 lines
38 KiB
JavaScript
Raw Normal View History

Initial work on XEP-0363: HTTP File Upload
2018-03-28 18:38:22 +02:00
(function (root, factory) {
define([
"jasmine",
"mock",
"test-utils"], factory);
Get tests to run agains the webpack build
2018-06-03 16:40:20 +02:00
} (this, function (jasmine, mock, test_utils) {
Initial work on XEP-0363: HTTP File Upload
2018-03-28 18:38:22 +02:00
"use strict";
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const Strophe = converse.env.Strophe;
const $iq = converse.env.$iq;
const _ = converse.env._;
Fetch messages in MUC model
2019-05-19 22:11:26 +02:00
const sizzle = converse.env.sizzle;
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const u = converse.env.utils;
Initial work on XEP-0363: HTTP File Upload
2018-03-28 18:38:22 +02:00
describe("XEP-0363: HTTP File Upload", function () {
describe("Discovering support", function () {
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("is done automatically", mock.initConverse(async (done, _converse) => {
const IQ_stanzas = _converse.connection.IQ_stanzas;
const IQ_ids = _converse.connection.IQ_ids;
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.bare_jid, [], []);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => _.filter(
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
IQ_stanzas,
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
iq => iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]')).length
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
);
/* <iq type='result'
* from='plays.shakespeare.lit'
* to='romeo@montague.net/orchard'
* id='info1'>
* <query xmlns='http://jabber.org/protocol/disco#info'>
* <identity
* category='server'
* type='im'/>
* <feature var='http://jabber.org/protocol/disco#info'/>
* <feature var='http://jabber.org/protocol/disco#items'/>
* </query>
* </iq>
*/
let stanza = _.find(IQ_stanzas, function (iq) {
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
return iq.querySelector(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
});
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const info_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
stanza = $iq({
'type': 'result',
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'from': 'montague.lit',
'to': 'romeo@montague.lit/orchard',
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
'id': info_IQ_id
}).c('query', {'xmlns': 'http://jabber.org/protocol/disco#info'})
.c('identity', {
'category': 'server',
'type': 'im'}).up()
.c('feature', {
'var': 'http://jabber.org/protocol/disco#info'}).up()
.c('feature', {
'var': 'http://jabber.org/protocol/disco#items'});
_converse.connection._dataRecv(test_utils.createRequest(stanza));
Change `api.disco.supports` to resolve to a Boolean Also add a new API method `api.disco.features.get` for the use-case where you still want the feature object to be returned.
2019-05-07 09:53:36 +02:00
let entities = await _converse.api.disco.entities.get();
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
expect(entities.length).toBe(2);
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
expect(_.includes(entities.pluck('jid'), 'montague.lit')).toBe(true);
expect(_.includes(entities.pluck('jid'), 'romeo@montague.lit')).toBe(true);
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
expect(entities.get(_converse.domain).features.length).toBe(2);
expect(entities.get(_converse.domain).identities.length).toBe(1);
// Converse.js sees that the entity has a disco#items feature,
// so it will make a query for it.
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => _.filter(
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
IQ_stanzas,
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
iq => iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#items"]')
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
).length
);
/* <iq from='montague.tld'
* id='step_01'
* to='romeo@montague.tld/garden'
* type='result'>
* <query xmlns='http://jabber.org/protocol/disco#items'>
* <item jid='upload.montague.tld' name='HTTP File Upload' />
* <item jid='conference.montague.tld' name='Chatroom Service' />
* </query>
* </iq>
*/
stanza = _.find(IQ_stanzas, function (iq) {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
return iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#items"]');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
});
Change `api.disco.supports` to resolve to a Boolean Also add a new API method `api.disco.features.get` for the use-case where you still want the feature object to be returned.
2019-05-07 09:53:36 +02:00
const items_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
stanza = $iq({
'type': 'result',
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'from': 'montague.lit',
'to': 'romeo@montague.lit/orchard',
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
'id': items_IQ_id
}).c('query', {'xmlns': 'http://jabber.org/protocol/disco#items'})
.c('item', {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'jid': 'upload.montague.lit',
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
'name': 'HTTP File Upload'});
_converse.connection._dataRecv(test_utils.createRequest(stanza));
_converse.api.disco.entities.get().then(function (entities) {
expect(entities.length).toBe(2);
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
expect(entities.get('montague.lit').items.length).toBe(1);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
return u.waitUntil(function () {
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
// Converse.js sees that the entity has a disco#info feature,
// so it will make a query for it.
Initial work on XEP-0363: HTTP File Upload
2018-03-28 18:38:22 +02:00
return _.filter(IQ_stanzas, function (iq) {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
return iq.querySelector('iq[to="upload.montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
}).length > 0;
}, 300);
});
Fix disco hierarchy Previously we kept all entities and their items (which are also instances of _converse.DiscoEntity) in a flat array. Instead, we should have a tree-like structure where items are stored on the relevant entity (and recursively on other items).
2018-03-29 16:12:19 +02:00
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
stanza = await u.waitUntil(() =>
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
_.filter(
IQ_stanzas,
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
iq => iq.querySelector('iq[to="upload.montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]')
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
).pop()
);
const IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
expect(Strophe.serialize(stanza)).toBe(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`<iq from="romeo@montague.lit/orchard" id="`+IQ_id+`" to="upload.montague.lit" type="get" xmlns="jabber:client">`+
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
`<query xmlns="http://jabber.org/protocol/disco#info"/>`+
`</iq>`);
// Upload service responds and reports a maximum file size of 5MiB
/* <iq from='upload.montague.tld'
* id='step_02'
* to='romeo@montague.tld/garden'
* type='result'>
* <query xmlns='http://jabber.org/protocol/disco#info'>
* <identity category='store'
* type='file'
* name='HTTP File Upload' />
* <feature var='urn:xmpp:http:upload:0' />
* <x type='result' xmlns='jabber:x:data'>
* <field var='FORM_TYPE' type='hidden'>
* <value>urn:xmpp:http:upload:0</value>
* </field>
* <field var='max-file-size'>
* <value>5242880</value>
* </field>
* </x>
* </query>
* </iq>
*/
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
stanza = $iq({'type': 'result', 'to': 'romeo@montague.lit/orchard', 'id': IQ_id, 'from': 'upload.montague.lit'})
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
.c('query', {'xmlns': 'http://jabber.org/protocol/disco#info'})
.c('identity', {'category':'store', 'type':'file', 'name':'HTTP File Upload'}).up()
.c('feature', {'var':'urn:xmpp:http:upload:0'}).up()
.c('x', {'type':'result', 'xmlns':'jabber:x:data'})
.c('field', {'var':'FORM_TYPE', 'type':'hidden'})
.c('value').t('urn:xmpp:http:upload:0').up().up()
.c('field', {'var':'max-file-size'})
.c('value').t('5242880');
_converse.connection._dataRecv(test_utils.createRequest(stanza));
Change `api.disco.supports` to resolve to a Boolean Also add a new API method `api.disco.features.get` for the use-case where you still want the feature object to be returned.
2019-05-07 09:53:36 +02:00
entities = await _converse.api.disco.entities.get();
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
expect(entities.get('montague.lit').items.get('upload.montague.lit').identities.where({'category': 'store'}).length).toBe(1);
Change `api.disco.supports` to resolve to a Boolean Also add a new API method `api.disco.features.get` for the use-case where you still want the feature object to be returned.
2019-05-07 09:53:36 +02:00
const supported = await _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain);
expect(supported).toBe(true);
const features = await _converse.api.disco.features.get(Strophe.NS.HTTPUPLOAD, _converse.domain);
expect(features.length).toBe(1);
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
expect(features[0].get('jid')).toBe('upload.montague.lit');
Change `api.disco.supports` to resolve to a Boolean Also add a new API method `api.disco.features.get` for the use-case where you still want the feature object to be returned.
2019-05-07 09:53:36 +02:00
expect(features[0].dataforms.where({'FORM_TYPE': {value: "urn:xmpp:http:upload:0", type: "hidden"}}).length).toBe(1);
done();
Initial work on XEP-0363: HTTP File Upload
2018-03-28 18:38:22 +02:00
}));
});
Fix disco hierarchy Previously we kept all entities and their items (which are also instances of _converse.DiscoEntity) in a flat array. Instead, we should have a tree-like structure where items are stored on the relevant entity (and recursively on other items).
2018-03-29 16:12:19 +02:00
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
describe("When not supported", function () {
describe("A file upload toolbar button", function () {
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("does not appear in private chats", mock.initConverse(async (done, _converse) => {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
var contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
test_utils.createContacts(_converse, 'current');
Don't unnecessarily fetch the roster If we've fetched the roster before within this session, then we don't have to do so again, regardless of whether versioning is supported or not, otherwise, even if we have a cached roster, we still need to get the latest one again.
2019-07-29 18:51:25 +02:00
// Hack to avoid having to fetch the roster again.
_converse.session.set('roster_fetched', true);
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
test_utils.openChatBoxFor(_converse, contact_jid);
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
await test_utils.waitUntilDiscoConfirmed(
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
_converse, _converse.domain,
[{'category': 'server', 'type':'IM'}],
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
['http://jabber.org/protocol/disco#items'], [], 'info');
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], [], 'items');
const view = _converse.chatboxviews.get(contact_jid);
expect(view.el.querySelector('.chat-toolbar .upload-file')).toBe(null);
done();
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
}));
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("does not appear in MUC chats", mock.initConverse(
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
null, ['rosterGroupsFetched'], {},
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
async (done, _converse) => {
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
Update `openAndEnterChatRoom` to take JID
2019-07-03 14:18:46 +02:00
await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
test_utils.waitUntilDiscoConfirmed(
_converse, _converse.domain,
[{'category': 'server', 'type':'IM'}],
['http://jabber.org/protocol/disco#items'], [], 'info');
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.lit'], 'items');
await test_utils.waitUntilDiscoConfirmed(_converse, 'upload.montague.lit', [], [Strophe.NS.HTTPUPLOAD], []);
const view = _converse.chatboxviews.get('lounge@montague.lit');
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
expect(view.el.querySelector('.chat-toolbar .upload-file')).toBe(null);
done();
Also test for when XEP-0363 is not supported Updates #161
2018-04-22 17:47:34 +02:00
}));
});
});
Fix disco hierarchy Previously we kept all entities and their items (which are also instances of _converse.DiscoEntity) in a flat array. Instead, we should have a tree-like structure where items are stored on the relevant entity (and recursively on other items).
2018-03-29 16:12:19 +02:00
describe("When supported", function () {
describe("A file upload toolbar button", function () {
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("appears in private chats", mock.initConverse(async (done, _converse) => {
await test_utils.waitUntilDiscoConfirmed(
Add file-upload button
2018-03-29 20:22:05 +02:00
_converse, _converse.domain,
[{'category': 'server', 'type':'IM'}],
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
['http://jabber.org/protocol/disco#items'], [], 'info');
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.lit'], 'items')
await test_utils.waitUntilDiscoConfirmed(_converse, 'upload.montague.lit', [], [Strophe.NS.HTTPUPLOAD], []);
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
test_utils.createContacts(_converse, 'current', 3);
Rename `emit` to `trigger` for consistency with Backbone.Events
2019-03-29 21:10:45 +01:00
_converse.api.trigger('rosterContactsFetched');
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
const contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
await test_utils.openChatBoxFor(_converse, contact_jid);
const view = _converse.chatboxviews.get(contact_jid);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
u.waitUntil(() => view.el.querySelector('.upload-file'));
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
expect(view.el.querySelector('.chat-toolbar .upload-file')).not.toBe(null);
done();
Fix disco hierarchy Previously we kept all entities and their items (which are also instances of _converse.DiscoEntity) in a flat array. Instead, we should have a tree-like structure where items are stored on the relevant entity (and recursively on other items).
2018-03-29 16:12:19 +02:00
}));
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("appears in MUC chats", mock.initConverse(
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
null, ['rosterGroupsFetched', 'chatBoxesFetched'], {},
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
async (done, _converse) => {
Add tests for XEP-0363 for MUC Update #161
2018-04-22 17:02:01 +02:00
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
await test_utils.waitUntilDiscoConfirmed(
Add tests for XEP-0363 for MUC Update #161
2018-04-22 17:02:01 +02:00
_converse, _converse.domain,
[{'category': 'server', 'type':'IM'}],
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
['http://jabber.org/protocol/disco#items'], [], 'info');
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.lit'], 'items');
await test_utils.waitUntilDiscoConfirmed(_converse, 'upload.montague.lit', [], [Strophe.NS.HTTPUPLOAD], []);
Update `openAndEnterChatRoom` to take JID
2019-07-03 14:18:46 +02:00
await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => _converse.chatboxviews.get('lounge@montague.lit').el.querySelector('.upload-file'));
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
const view = _converse.chatboxviews.get('lounge@montague.lit');
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
expect(view.el.querySelector('.chat-toolbar .upload-file')).not.toBe(null);
done();
Fix disco hierarchy Previously we kept all entities and their items (which are also instances of _converse.DiscoEntity) in a flat array. Instead, we should have a tree-like structure where items are stored on the relevant entity (and recursively on other items).
2018-03-29 16:12:19 +02:00
}));
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
Honor the filesize restrictions of the XMPP server updates #161
2018-04-18 10:03:21 +02:00
describe("when clicked and a file chosen", function () {
Move methods from chatbox view to message view Specifically the methods related to requesting an upload slot and uploading a file. Also show a progress indicator while a file is being uploaded. Updates #161
2018-04-17 15:17:39 +02:00
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("is uploaded and sent out", mock.initConverse(async (done, _converse) => {
Don't render http (i.e. non-TLS) resources Causes "Mixed Content" TLS errors
2018-11-18 15:56:14 +01:00
const base_url = 'https://conversejs.org';
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
await test_utils.waitUntilDiscoConfirmed(
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
_converse, _converse.domain,
[{'category': 'server', 'type':'IM'}],
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
['http://jabber.org/protocol/disco#items'], [], 'info');
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
const send_backup = XMLHttpRequest.prototype.send;
const IQ_stanzas = _converse.connection.IQ_stanzas;
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.tld'], 'items');
await test_utils.waitUntilDiscoConfirmed(_converse, 'upload.montague.tld', [], [Strophe.NS.HTTPUPLOAD], []);
test_utils.createContacts(_converse, 'current');
Rename `emit` to `trigger` for consistency with Backbone.Events
2019-03-29 21:10:45 +01:00
_converse.api.trigger('rosterContactsFetched');
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
const contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
await test_utils.openChatBoxFor(_converse, contact_jid);
const view = _converse.chatboxviews.get(contact_jid);
const file = {
'type': 'image/jpeg',
'size': '23456' ,
'lastModifiedDate': "",
'name': "my-juliet.jpg"
};
view.model.sendFiles([file]);
await new Promise((resolve, reject) => view.once('messageInserted', resolve));
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => _.filter(IQ_stanzas, iq => iq.querySelector('iq[to="upload.montague.tld"] request')).length);
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const iq = IQ_stanzas.pop();
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
expect(Strophe.serialize(iq)).toBe(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`<iq from="romeo@montague.lit/orchard" `+
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
`id="${iq.getAttribute("id")}" `+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`to="upload.montague.tld" `+
`type="get" `+
`xmlns="jabber:client">`+
`<request `+
`content-type="image/jpeg" `+
`filename="my-juliet.jpg" `+
`size="23456" `+
`xmlns="urn:xmpp:http:upload:0"/>`+
`</iq>`);
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const message = base_url+"/logo/conversejs-filled.svg";
const stanza = u.toStanza(`
<iq from="upload.montague.tld"
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
id="${iq.getAttribute("id")}"
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
to="romeo@montague.lit/orchard"
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
type="result">
<slot xmlns="urn:xmpp:http:upload:0">
<put url="https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my-juliet.jpg">
<header name="Authorization">Basic Base64String==</header>
<header name="Cookie">foo=bar; user=romeo</header>
</put>
<get url="${message}" />
</slot>
</iq>`);
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
spyOn(XMLHttpRequest.prototype, 'send').and.callFake(function () {
const message = view.model.messages.at(0);
expect(view.el.querySelector('.chat-content progress').getAttribute('value')).toBe('0');
message.set('progress', 0.5);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
u.waitUntil(() => view.el.querySelector('.chat-content progress').getAttribute('value') === '0.5')
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
.then(() => {
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
message.set('progress', 1);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
u.waitUntil(() => view.el.querySelector('.chat-content progress').getAttribute('value') === '1')
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
}).then(() => {
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
message.save({
'upload': _converse.SUCCESS,
'oob_url': message.get('get'),
'message': message.get('get')
Add tests for XEP-0363 for MUC Update #161
2018-04-22 17:02:01 +02:00
});
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
return new Promise((resolve, reject) => view.model.messages.once('rendered', resolve));
Add tests for XEP-0363 for MUC Update #161
2018-04-22 17:02:01 +02:00
});
});
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
let sent_stanza;
spyOn(_converse.connection, 'send').and.callFake(stanza => (sent_stanza = stanza));
_converse.connection._dataRecv(test_utils.createRequest(stanza));
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => sent_stanza, 1000);
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
expect(sent_stanza.toLocaleString()).toBe(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`<message from="romeo@montague.lit/orchard" `+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`id="${sent_stanza.nodeTree.getAttribute("id")}" `+
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`to="lady.montague@montague.lit" `+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`type="chat" `+
`xmlns="jabber:client">`+
`<body>${message}</body>`+
`<active xmlns="http://jabber.org/protocol/chatstates"/>`+
implement XEP-0184: Message Delivery Receipts
2018-11-03 14:37:57 +01:00
`<request xmlns="urn:xmpp:receipts"/>`+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`<x xmlns="jabber:x:oob">`+
`<url>${message}</url>`+
`</x>`+
Include `origin-id` in outgoing messages
2019-02-07 14:15:49 +01:00
`<origin-id id="${sent_stanza.nodeTree.querySelector('origin-id').getAttribute("id")}" xmlns="urn:xmpp:sid:0"/>`+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`</message>`);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => view.el.querySelector('.chat-image'), 1000);
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
// Check that the image renders
expect(view.el.querySelector('.chat-msg .chat-msg__media').innerHTML.trim()).toEqual(
`<!-- src/templates/image.html -->\n`+
Don't render http (i.e. non-TLS) resources Causes "Mixed Content" TLS errors
2018-11-18 15:56:14 +01:00
`<a href="${base_url}/logo/conversejs-filled.svg" target="_blank" rel="noopener">`+
`<img class="chat-image img-thumbnail" src="${base_url}/logo/conversejs-filled.svg">`+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`</a>`);
XMLHttpRequest.prototype.send = send_backup;
done();
Add tests for XEP-0363 for MUC Update #161
2018-04-22 17:02:01 +02:00
}));
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("is uploaded and sent out from a groupchat", mock.initConverse(async (done, _converse) => {
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
Don't render http (i.e. non-TLS) resources Causes "Mixed Content" TLS errors
2018-11-18 15:56:14 +01:00
const base_url = 'https://conversejs.org';
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
await test_utils.waitUntilDiscoConfirmed(
Add tests for XEP-0363 for MUC Update #161
2018-04-22 17:02:01 +02:00
_converse, _converse.domain,
[{'category': 'server', 'type':'IM'}],
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
['http://jabber.org/protocol/disco#items'], [], 'info');
const send_backup = XMLHttpRequest.prototype.send;
const IQ_stanzas = _converse.connection.IQ_stanzas;
Add tests for XEP-0363 for MUC Update #161
2018-04-22 17:02:01 +02:00
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.tld'], 'items');
await test_utils.waitUntilDiscoConfirmed(_converse, 'upload.montague.tld', [], [Strophe.NS.HTTPUPLOAD], []);
Update `openAndEnterChatRoom` to take JID
2019-07-03 14:18:46 +02:00
await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
Fetch messages in MUC model
2019-05-19 22:11:26 +02:00
// Wait until MAM query has been sent out
const sent_stanzas = _converse.connection.sent_stanzas;
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => sent_stanzas.filter(s => sizzle(`[xmlns="${Strophe.NS.MAM}"]`, s).length).pop());
Fetch messages in MUC model
2019-05-19 22:11:26 +02:00
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
const view = _converse.chatboxviews.get('lounge@montague.lit');
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
const file = {
'type': 'image/jpeg',
'size': '23456' ,
'lastModifiedDate': "",
'name': "my-juliet.jpg"
};
view.model.sendFiles([file]);
await new Promise((resolve, reject) => view.once('messageInserted', resolve));
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => _.filter(IQ_stanzas, iq => iq.querySelector('iq[to="upload.montague.tld"] request')).length);
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const iq = IQ_stanzas.pop();
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
expect(Strophe.serialize(iq)).toBe(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`<iq from="romeo@montague.lit/orchard" `+
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
`id="${iq.getAttribute("id")}" `+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`to="upload.montague.tld" `+
`type="get" `+
`xmlns="jabber:client">`+
`<request `+
`content-type="image/jpeg" `+
`filename="my-juliet.jpg" `+
`size="23456" `+
`xmlns="urn:xmpp:http:upload:0"/>`+
`</iq>`);
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const message = base_url+"/logo/conversejs-filled.svg";
const stanza = u.toStanza(`
<iq from='upload.montague.tld'
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
id="${iq.getAttribute('id')}"
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
to='romeo@montague.lit/orchard'
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
type='result'>
<slot xmlns='urn:xmpp:http:upload:0'>
<put url='https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my-juliet.jpg'>
<header name='Authorization'>Basic Base64String==</header>
<header name='Cookie'>foo=bar; user=romeo</header>
</put>
<get url="${message}" />
</slot>
</iq>`);
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
spyOn(XMLHttpRequest.prototype, 'send').and.callFake(function () {
const message = view.model.messages.at(0);
expect(view.el.querySelector('.chat-content progress').getAttribute('value')).toBe('0');
message.set('progress', 0.5);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
u.waitUntil(() => view.el.querySelector('.chat-content progress').getAttribute('value') === '0.5')
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
.then(() => {
message.set('progress', 1);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
u.waitUntil(() => view.el.querySelector('.chat-content progress').getAttribute('value') === '1')
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
}).then(() => {
message.save({
'upload': _converse.SUCCESS,
'oob_url': message.get('get'),
'message': message.get('get')
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
});
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
return new Promise((resolve, reject) => view.model.messages.once('rendered', resolve));
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
});
});
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
let sent_stanza;
spyOn(_converse.connection, 'send').and.callFake(stanza => (sent_stanza = stanza));
_converse.connection._dataRecv(test_utils.createRequest(stanza));
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => sent_stanza, 1000);
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
expect(sent_stanza.toLocaleString()).toBe(
`<message `+
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`from="romeo@montague.lit/orchard" `+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`id="${sent_stanza.nodeTree.getAttribute("id")}" `+
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`to="lounge@montague.lit" `+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`type="groupchat" `+
`xmlns="jabber:client">`+
`<body>${message}</body>`+
`<active xmlns="http://jabber.org/protocol/chatstates"/>`+
`<x xmlns="jabber:x:oob">`+
`<url>${message}</url>`+
`</x>`+
Include `origin-id` in outgoing messages
2019-02-07 14:15:49 +01:00
`<origin-id id="${sent_stanza.nodeTree.querySelector('origin-id').getAttribute("id")}" xmlns="urn:xmpp:sid:0"/>`+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`</message>`);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => view.el.querySelector('.chat-image'), 1000);
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
// Check that the image renders
expect(view.el.querySelector('.chat-msg .chat-msg__media').innerHTML.trim()).toEqual(
`<!-- src/templates/image.html -->\n`+
Don't render http (i.e. non-TLS) resources Causes "Mixed Content" TLS errors
2018-11-18 15:56:14 +01:00
`<a href="${base_url}/logo/conversejs-filled.svg" target="_blank" rel="noopener">`+
`<img class="chat-image img-thumbnail" src="${base_url}/logo/conversejs-filled.svg">`+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`</a>`);
XMLHttpRequest.prototype.send = send_backup;
done();
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
}));
Honor the filesize restrictions of the XMPP server updates #161
2018-04-18 10:03:21 +02:00
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("shows an error message if the file is too large", mock.initConverse(async (done, _converse) => {
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
const IQ_stanzas = _converse.connection.IQ_stanzas;
const IQ_ids = _converse.connection.IQ_ids;
const send_backup = XMLHttpRequest.prototype.send;
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.bare_jid, [], []);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => _.filter(
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
IQ_stanzas,
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
iq => iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]')).length
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
);
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
let stanza = _.find(IQ_stanzas, function (iq) {
return iq.querySelector(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
});
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
const info_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
stanza = $iq({
'type': 'result',
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'from': 'montague.lit',
'to': 'romeo@montague.lit/orchard',
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
'id': info_IQ_id
}).c('query', {'xmlns': 'http://jabber.org/protocol/disco#info'})
.c('identity', {
'category': 'server',
'type': 'im'}).up()
.c('feature', {
'var': 'http://jabber.org/protocol/disco#info'}).up()
.c('feature', {
'var': 'http://jabber.org/protocol/disco#items'});
_converse.connection._dataRecv(test_utils.createRequest(stanza));
let entities = await _converse.api.disco.entities.get();
expect(entities.length).toBe(2);
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
expect(_.includes(entities.pluck('jid'), 'montague.lit')).toBe(true);
expect(_.includes(entities.pluck('jid'), 'romeo@montague.lit')).toBe(true);
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
expect(entities.get(_converse.domain).features.length).toBe(2);
expect(entities.get(_converse.domain).identities.length).toBe(1);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(function () {
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
// Converse.js sees that the entity has a disco#items feature,
// so it will make a query for it.
return _.filter(IQ_stanzas, function (iq) {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
return iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#items"]');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
}).length > 0;
}, 300);
stanza = _.find(IQ_stanzas, function (iq) {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
return iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#items"]');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
});
var items_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
stanza = $iq({
'type': 'result',
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'from': 'montague.lit',
'to': 'romeo@montague.lit/orchard',
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
'id': items_IQ_id
}).c('query', {'xmlns': 'http://jabber.org/protocol/disco#items'})
.c('item', {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
'jid': 'upload.montague.lit',
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
'name': 'HTTP File Upload'});
_converse.connection._dataRecv(test_utils.createRequest(stanza));
entities = await _converse.api.disco.entities.get()
expect(entities.length).toBe(2);
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
expect(entities.get('montague.lit').items.length).toBe(1);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(function () {
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
// Converse.js sees that the entity has a disco#info feature,
// so it will make a query for it.
return _.filter(IQ_stanzas, function (iq) {
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
return iq.querySelector('iq[to="upload.montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
}).length > 0;
}, 300);
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
stanza = _.find(IQ_stanzas, iq => iq.querySelector('iq[to="upload.montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]'));
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
const IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
expect(Strophe.serialize(stanza)).toBe(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`<iq from="romeo@montague.lit/orchard" id="${IQ_id}" to="upload.montague.lit" type="get" xmlns="jabber:client">`+
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
`<query xmlns="http://jabber.org/protocol/disco#info"/>`+
`</iq>`);
// Upload service responds and reports a maximum file size of 5MiB
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
stanza = $iq({'type': 'result', 'to': 'romeo@montague.lit/orchard', 'id': IQ_id, 'from': 'upload.montague.lit'})
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
.c('query', {'xmlns': 'http://jabber.org/protocol/disco#info'})
.c('identity', {'category':'store', 'type':'file', 'name':'HTTP File Upload'}).up()
.c('feature', {'var':'urn:xmpp:http:upload:0'}).up()
.c('x', {'type':'result', 'xmlns':'jabber:x:data'})
.c('field', {'var':'FORM_TYPE', 'type':'hidden'})
.c('value').t('urn:xmpp:http:upload:0').up().up()
.c('field', {'var':'max-file-size'})
.c('value').t('5242880');
_converse.connection._dataRecv(test_utils.createRequest(stanza));
entities = await _converse.api.disco.entities.get();
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
expect(entities.get('montague.lit').items.get('upload.montague.lit').identities.where({'category': 'store'}).length).toBe(1);
Change `api.disco.supports` to resolve to a Boolean Also add a new API method `api.disco.features.get` for the use-case where you still want the feature object to be returned.
2019-05-07 09:53:36 +02:00
await _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain);
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
test_utils.createContacts(_converse, 'current');
Rename `emit` to `trigger` for consistency with Backbone.Events
2019-03-29 21:10:45 +01:00
_converse.api.trigger('rosterContactsFetched');
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
const contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
await test_utils.openChatBoxFor(_converse, contact_jid);
const view = _converse.chatboxviews.get(contact_jid);
var file = {
'type': 'image/jpeg',
'size': '5242881',
'lastModifiedDate': "",
'name': "my-juliet.jpg"
};
view.model.sendFiles([file]);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => view.el.querySelectorAll('.message').length)
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
const messages = view.el.querySelectorAll('.message.chat-error');
expect(messages.length).toBe(1);
Show error message with option to retry when MAM query times out
2019-08-12 20:16:34 +02:00
expect(messages[0].textContent.trim()).toBe(
Fix failing tests and rewrite to use async/await
2018-10-26 10:15:01 +02:00
'The size of your file, my-juliet.jpg, exceeds the maximum allowed by your server, which is 5 MB.');
done();
Honor the filesize restrictions of the XMPP server updates #161
2018-04-18 10:03:21 +02:00
}));
Updated and refactored the work from @worlword * Use Promises instead of callbacks * Update to latest (Last Call) version of XEP-0363 * Move non-view specific methods to models instead * Add more tests updates #161
2018-04-14 21:13:02 +02:00
});
Fix disco hierarchy Previously we kept all entities and their items (which are also instances of _converse.DiscoEntity) in a flat array. Instead, we should have a tree-like structure where items are stored on the relevant entity (and recursively on other items).
2018-03-29 16:12:19 +02:00
});
Provide metadata of file being uploaded. updates #161
2018-04-18 11:49:53 +02:00
describe("While a file is being uploaded", function () {
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
it("shows a progress bar", mock.initConverse(
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
null, ['rosterGroupsFetched', 'chatBoxesFetched'], {},
async function (done, _converse) {
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
await test_utils.waitUntilDiscoConfirmed(
Provide metadata of file being uploaded. updates #161
2018-04-18 11:49:53 +02:00
_converse, _converse.domain,
[{'category': 'server', 'type':'IM'}],
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
['http://jabber.org/protocol/disco#items'], [], 'info');
Provide metadata of file being uploaded. updates #161
2018-04-18 11:49:53 +02:00
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
const send_backup = XMLHttpRequest.prototype.send;
const IQ_stanzas = _converse.connection.IQ_stanzas;
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.tld'], 'items');
await test_utils.waitUntilDiscoConfirmed(_converse, 'upload.montague.tld', [], [Strophe.NS.HTTPUPLOAD], []);
test_utils.createContacts(_converse, 'current');
Rename `emit` to `trigger` for consistency with Backbone.Events
2019-03-29 21:10:45 +01:00
_converse.api.trigger('rosterContactsFetched');
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
const contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
await test_utils.openChatBoxFor(_converse, contact_jid);
const view = _converse.chatboxviews.get(contact_jid);
const file = {
'type': 'image/jpeg',
'size': '23456' ,
'lastModifiedDate': "",
'name': "my-juliet.jpg"
};
view.model.sendFiles([file]);
await new Promise((resolve, reject) => view.once('messageInserted', resolve));
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
await u.waitUntil(() => _.filter(IQ_stanzas, iq => iq.querySelector('iq[to="upload.montague.tld"] request')).length)
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
const iq = IQ_stanzas.pop();
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
expect(Strophe.serialize(iq)).toBe(
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
`<iq from="romeo@montague.lit/orchard" `+
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
`id="${iq.getAttribute("id")}" `+
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
`to="upload.montague.tld" `+
`type="get" `+
`xmlns="jabber:client">`+
`<request `+
`content-type="image/jpeg" `+
`filename="my-juliet.jpg" `+
`size="23456" `+
`xmlns="urn:xmpp:http:upload:0"/>`+
`</iq>`);
Don't render http (i.e. non-TLS) resources Causes "Mixed Content" TLS errors
2018-11-18 15:56:14 +01:00
const base_url = 'https://conversejs.org';
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
const message = base_url+"/logo/conversejs-filled.svg";
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
const stanza = u.toStanza(`
<iq from="upload.montague.tld"
Refactor tests so that IQ_ids always contains only XML stanzas
2019-05-20 12:38:33 +02:00
id="${iq.getAttribute("id")}"
Use shakespearean character names in tests
2019-06-03 07:58:51 +02:00
to="romeo@montague.lit/orchard"
Make `converse.initialize` an `async` function - Combine all test init functions into `initConverse` - Use `async` functions in more tests - Replace `var` with `let` and `const` in more tests - New utils method `toStanza` which converts a string to a Node
2019-02-12 14:21:45 +01:00
type="result">
<slot xmlns="urn:xmpp:http:upload:0">
<put url="https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my-juliet.jpg">
<header name="Authorization">Basic Base64String==</header>
<header name="Cookie">foo=bar; user=romeo</header>
</put>
<get url="${message}" />
</slot>
</iq>`);
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
spyOn(XMLHttpRequest.prototype, 'send').and.callFake(function () {
const message = view.model.messages.at(0);
expect(view.el.querySelector('.chat-content progress').getAttribute('value')).toBe('0');
message.set('progress', 0.5);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
u.waitUntil(() => view.el.querySelector('.chat-content progress').getAttribute('value') === '0.5')
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
.then(() => {
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
message.set('progress', 1);
Replace wait-until-promise with utility method and bump default timeout Also let `_converse.api.waitUntil` use it if a function is passed in.
2019-07-11 22:50:30 +02:00
u.waitUntil(() => view.el.querySelector('.chat-content progress').getAttribute('value') === '1')
Wait for promises before opening chats in API methods
2018-07-30 18:16:32 +02:00
}).then(() => {
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
expect(view.el.querySelector('.chat-content .chat-msg__text').textContent).toBe('Uploading file: my-juliet.jpg, 22.91 KB');
done();
Provide metadata of file being uploaded. updates #161
2018-04-18 11:49:53 +02:00
});
});
Make the message view's `render` method async So that we first render dynamic content (e.g. images) before inserting it into the chat. Also, add the `show_images_inline` setting (which is the cause of this whole change). Updated tests to handle this new change and start using async/await instead of promise callbacks.
2018-10-13 23:25:01 +02:00
let sent_stanza;
spyOn(_converse.connection, 'send').and.callFake(stanza => (sent_stanza = stanza));
_converse.connection._dataRecv(test_utils.createRequest(stanza));
Provide metadata of file being uploaded. updates #161
2018-04-18 11:49:53 +02:00
}));
});
Fix disco hierarchy Previously we kept all entities and their items (which are also instances of _converse.DiscoEntity) in a flat array. Instead, we should have a tree-like structure where items are stored on the relevant entity (and recursively on other items).
2018-03-29 16:12:19 +02:00
});
Initial work on XEP-0363: HTTP File Upload
2018-03-28 18:38:22 +02:00
});
}));
Reference in New Issue Copy Permalink