|
|
@@ -14,159 +14,159 @@
|
|
|
|
|
|
describe("Discovering support", function () {
|
|
|
|
|
|
- it("is done automatically", mock.initConverseWithAsync(function (done, _converse) {
|
|
|
+ it("is done automatically", mock.initConverseWithAsync(async function (done, _converse) {
|
|
|
var IQ_stanzas = _converse.connection.IQ_stanzas;
|
|
|
var IQ_ids = _converse.connection.IQ_ids;
|
|
|
|
|
|
- test_utils.waitUntilDiscoConfirmed(_converse, _converse.bare_jid, [], []).then(function () {
|
|
|
- test_utils.waitUntil(function () {
|
|
|
+ await test_utils.waitUntilDiscoConfirmed(_converse, _converse.bare_jid, [], []);
|
|
|
+ await test_utils.waitUntil(() => _.filter(
|
|
|
+ IQ_stanzas,
|
|
|
+ iq => iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]')).length
|
|
|
+ );
|
|
|
+
|
|
|
+ /* <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) {
|
|
|
+ return iq.nodeTree.querySelector(
|
|
|
+ 'iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
+ });
|
|
|
+ var info_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
+
|
|
|
+ stanza = $iq({
|
|
|
+ 'type': 'result',
|
|
|
+ 'from': 'localhost',
|
|
|
+ 'to': 'dummy@localhost/resource',
|
|
|
+ '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));
|
|
|
+
|
|
|
+ const entities = await _converse.api.disco.entities.get();
|
|
|
+ expect(entities.length).toBe(2);
|
|
|
+ expect(_.includes(entities.pluck('jid'), 'localhost')).toBe(true);
|
|
|
+ expect(_.includes(entities.pluck('jid'), 'dummy@localhost')).toBe(true);
|
|
|
+
|
|
|
+ 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.
|
|
|
+ await test_utils.waitUntil(() => _.filter(
|
|
|
+ IQ_stanzas,
|
|
|
+ iq => iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#items"]')
|
|
|
+ ).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) {
|
|
|
+ return iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#items"]');
|
|
|
+ });
|
|
|
+ var items_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
+ stanza = $iq({
|
|
|
+ 'type': 'result',
|
|
|
+ 'from': 'localhost',
|
|
|
+ 'to': 'dummy@localhost/resource',
|
|
|
+ 'id': items_IQ_id
|
|
|
+ }).c('query', {'xmlns': 'http://jabber.org/protocol/disco#items'})
|
|
|
+ .c('item', {
|
|
|
+ 'jid': 'upload.localhost',
|
|
|
+ 'name': 'HTTP File Upload'});
|
|
|
+
|
|
|
+ _converse.connection._dataRecv(test_utils.createRequest(stanza));
|
|
|
+
|
|
|
+ _converse.api.disco.entities.get().then(function (entities) {
|
|
|
+ expect(entities.length).toBe(2);
|
|
|
+ expect(entities.get('localhost').items.length).toBe(1);
|
|
|
+ return test_utils.waitUntil(function () {
|
|
|
+ // 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) {
|
|
|
- return iq.nodeTree.querySelector(
|
|
|
- 'iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
- }).length > 0;
|
|
|
- }, 300).then(function () {
|
|
|
- /* <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>
|
|
|
- */
|
|
|
- var stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
- return iq.nodeTree.querySelector(
|
|
|
- 'iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
- });
|
|
|
- var info_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
-
|
|
|
- stanza = $iq({
|
|
|
- 'type': 'result',
|
|
|
- 'from': 'localhost',
|
|
|
- 'to': 'dummy@localhost/resource',
|
|
|
- '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));
|
|
|
-
|
|
|
- _converse.api.disco.entities.get().then(function(entities) {
|
|
|
- expect(entities.length).toBe(2);
|
|
|
- expect(_.includes(entities.pluck('jid'), 'localhost')).toBe(true);
|
|
|
- expect(_.includes(entities.pluck('jid'), 'dummy@localhost')).toBe(true);
|
|
|
-
|
|
|
- expect(entities.get(_converse.domain).features.length).toBe(2);
|
|
|
- expect(entities.get(_converse.domain).identities.length).toBe(1);
|
|
|
-
|
|
|
- return test_utils.waitUntil(function () {
|
|
|
- // 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) {
|
|
|
- return iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#items"]');
|
|
|
- }).length > 0;
|
|
|
- }, 300);
|
|
|
- });
|
|
|
- }).then(function () {
|
|
|
- /* <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>
|
|
|
- */
|
|
|
- var stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
- return iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#items"]');
|
|
|
- });
|
|
|
- var items_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
- stanza = $iq({
|
|
|
- 'type': 'result',
|
|
|
- 'from': 'localhost',
|
|
|
- 'to': 'dummy@localhost/resource',
|
|
|
- 'id': items_IQ_id
|
|
|
- }).c('query', {'xmlns': 'http://jabber.org/protocol/disco#items'})
|
|
|
- .c('item', {
|
|
|
- 'jid': 'upload.localhost',
|
|
|
- 'name': 'HTTP File Upload'});
|
|
|
- _converse.connection._dataRecv(test_utils.createRequest(stanza));
|
|
|
-
|
|
|
- _converse.api.disco.entities.get().then(function (entities) {
|
|
|
- expect(entities.length).toBe(2);
|
|
|
- expect(entities.get('localhost').items.length).toBe(1);
|
|
|
- return test_utils.waitUntil(function () {
|
|
|
- // 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) {
|
|
|
- return iq.nodeTree.querySelector('iq[to="upload.localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
- }).length > 0;
|
|
|
- }, 300);
|
|
|
- });
|
|
|
- }).then(function () {
|
|
|
- var stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
return iq.nodeTree.querySelector('iq[to="upload.localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
- });
|
|
|
- var IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
- expect(stanza.toLocaleString()).toBe(
|
|
|
- `<iq from="dummy@localhost/resource" id="`+IQ_id+`" to="upload.localhost" type="get" xmlns="jabber:client">`+
|
|
|
- `<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>
|
|
|
- */
|
|
|
- stanza = $iq({'type': 'result', 'to': 'dummy@localhost/resource', 'id': IQ_id, 'from': 'upload.localhost'})
|
|
|
- .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));
|
|
|
+ }).length > 0;
|
|
|
+ }, 300);
|
|
|
+ });
|
|
|
|
|
|
- _converse.api.disco.entities.get().then(function (entities) {
|
|
|
- expect(entities.get('localhost').items.get('upload.localhost').identities.where({'category': 'store'}).length).toBe(1);
|
|
|
- _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain).then(
|
|
|
- function (result) {
|
|
|
- expect(result.length).toBe(1);
|
|
|
- expect(result[0].get('jid')).toBe('upload.localhost');
|
|
|
- expect(result[0].dataforms.where({'FORM_TYPE': {value: "urn:xmpp:http:upload:0", type: "hidden"}}).length).toBe(1);
|
|
|
- done();
|
|
|
- }
|
|
|
- );
|
|
|
- }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
|
|
|
- })
|
|
|
- })
|
|
|
+ stanza = await test_utils.waitUntil(() =>
|
|
|
+ _.filter(
|
|
|
+ IQ_stanzas,
|
|
|
+ iq => iq.nodeTree.querySelector('iq[to="upload.localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]')
|
|
|
+ ).pop()
|
|
|
+ );
|
|
|
+ const IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
+
|
|
|
+ expect(stanza.toLocaleString()).toBe(
|
|
|
+ `<iq from="dummy@localhost/resource" id="`+IQ_id+`" to="upload.localhost" type="get" xmlns="jabber:client">`+
|
|
|
+ `<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>
|
|
|
+ */
|
|
|
+ stanza = $iq({'type': 'result', 'to': 'dummy@localhost/resource', 'id': IQ_id, 'from': 'upload.localhost'})
|
|
|
+ .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));
|
|
|
+
|
|
|
+ _converse.api.disco.entities.get().then(function (entities) {
|
|
|
+ expect(entities.get('localhost').items.get('upload.localhost').identities.where({'category': 'store'}).length).toBe(1);
|
|
|
+ _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain).then(
|
|
|
+ function (result) {
|
|
|
+ expect(result.length).toBe(1);
|
|
|
+ expect(result[0].get('jid')).toBe('upload.localhost');
|
|
|
+ expect(result[0].dataforms.where({'FORM_TYPE': {value: "urn:xmpp:http:upload:0", type: "hidden"}}).length).toBe(1);
|
|
|
+ done();
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
|
|
|
}));
|
|
|
});
|
|
|
|
|
|
@@ -474,128 +474,124 @@
|
|
|
done();
|
|
|
}));
|
|
|
|
|
|
- it("shows an error message if the file is too large", mock.initConverseWithAsync(function (done, _converse) {
|
|
|
+ it("shows an error message if the file is too large", mock.initConverseWithAsync(async function (done, _converse) {
|
|
|
const IQ_stanzas = _converse.connection.IQ_stanzas;
|
|
|
const IQ_ids = _converse.connection.IQ_ids;
|
|
|
const send_backup = XMLHttpRequest.prototype.send;
|
|
|
- let view, contact_jid;
|
|
|
-
|
|
|
- test_utils.waitUntilDiscoConfirmed(_converse, _converse.bare_jid, [], [])
|
|
|
- .then(() => test_utils.waitUntil(() => _.filter(
|
|
|
- IQ_stanzas, (iq) => iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]')).length
|
|
|
- )).then(() => {
|
|
|
- var stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
- return iq.nodeTree.querySelector(
|
|
|
- 'iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
- });
|
|
|
- var info_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
-
|
|
|
- stanza = $iq({
|
|
|
- 'type': 'result',
|
|
|
- 'from': 'localhost',
|
|
|
- 'to': 'dummy@localhost/resource',
|
|
|
- '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));
|
|
|
- return _converse.api.disco.entities.get();
|
|
|
- }).then(function (entities) {
|
|
|
- expect(entities.length).toBe(2);
|
|
|
- expect(_.includes(entities.pluck('jid'), 'localhost')).toBe(true);
|
|
|
- expect(_.includes(entities.pluck('jid'), 'dummy@localhost')).toBe(true);
|
|
|
-
|
|
|
- expect(entities.get(_converse.domain).features.length).toBe(2);
|
|
|
- expect(entities.get(_converse.domain).identities.length).toBe(1);
|
|
|
-
|
|
|
- return test_utils.waitUntil(function () {
|
|
|
- // 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) {
|
|
|
- return iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#items"]');
|
|
|
- }).length > 0;
|
|
|
- }, 300);
|
|
|
- }).then(function () {
|
|
|
- var stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
+
|
|
|
+ await test_utils.waitUntilDiscoConfirmed(_converse, _converse.bare_jid, [], []);
|
|
|
+ await test_utils.waitUntil(() => _.filter(
|
|
|
+ IQ_stanzas,
|
|
|
+ iq => iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]')).length
|
|
|
+ );
|
|
|
+
|
|
|
+ var stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
+ return iq.nodeTree.querySelector(
|
|
|
+ 'iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
+ });
|
|
|
+ var info_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
+
|
|
|
+ stanza = $iq({
|
|
|
+ 'type': 'result',
|
|
|
+ 'from': 'localhost',
|
|
|
+ 'to': 'dummy@localhost/resource',
|
|
|
+ '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);
|
|
|
+ expect(_.includes(entities.pluck('jid'), 'localhost')).toBe(true);
|
|
|
+ expect(_.includes(entities.pluck('jid'), 'dummy@localhost')).toBe(true);
|
|
|
+
|
|
|
+ expect(entities.get(_converse.domain).features.length).toBe(2);
|
|
|
+ expect(entities.get(_converse.domain).identities.length).toBe(1);
|
|
|
+
|
|
|
+ await test_utils.waitUntil(function () {
|
|
|
+ // 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) {
|
|
|
return iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#items"]');
|
|
|
- });
|
|
|
- var items_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
- stanza = $iq({
|
|
|
- 'type': 'result',
|
|
|
- 'from': 'localhost',
|
|
|
- 'to': 'dummy@localhost/resource',
|
|
|
- 'id': items_IQ_id
|
|
|
- }).c('query', {'xmlns': 'http://jabber.org/protocol/disco#items'})
|
|
|
- .c('item', {
|
|
|
- 'jid': 'upload.localhost',
|
|
|
- 'name': 'HTTP File Upload'});
|
|
|
-
|
|
|
- _converse.connection._dataRecv(test_utils.createRequest(stanza));
|
|
|
-
|
|
|
- _converse.api.disco.entities.get().then(function (entities) {
|
|
|
- expect(entities.length).toBe(2);
|
|
|
- expect(entities.get('localhost').items.length).toBe(1);
|
|
|
- return test_utils.waitUntil(function () {
|
|
|
- // 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) {
|
|
|
- return iq.nodeTree.querySelector('iq[to="upload.localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
- }).length > 0;
|
|
|
- }, 300);
|
|
|
- });
|
|
|
- }).then(function () {
|
|
|
- var stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
+ }).length > 0;
|
|
|
+ }, 300);
|
|
|
+
|
|
|
+ stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
+ return iq.nodeTree.querySelector('iq[to="localhost"] query[xmlns="http://jabber.org/protocol/disco#items"]');
|
|
|
+ });
|
|
|
+ var items_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
+ stanza = $iq({
|
|
|
+ 'type': 'result',
|
|
|
+ 'from': 'localhost',
|
|
|
+ 'to': 'dummy@localhost/resource',
|
|
|
+ 'id': items_IQ_id
|
|
|
+ }).c('query', {'xmlns': 'http://jabber.org/protocol/disco#items'})
|
|
|
+ .c('item', {
|
|
|
+ 'jid': 'upload.localhost',
|
|
|
+ 'name': 'HTTP File Upload'});
|
|
|
+
|
|
|
+ _converse.connection._dataRecv(test_utils.createRequest(stanza));
|
|
|
+
|
|
|
+ entities = await _converse.api.disco.entities.get()
|
|
|
+
|
|
|
+ expect(entities.length).toBe(2);
|
|
|
+ expect(entities.get('localhost').items.length).toBe(1);
|
|
|
+ await test_utils.waitUntil(function () {
|
|
|
+ // 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) {
|
|
|
return iq.nodeTree.querySelector('iq[to="upload.localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
- });
|
|
|
- var IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
- expect(stanza.toLocaleString()).toBe(
|
|
|
- `<iq from="dummy@localhost/resource" id="${IQ_id}" to="upload.localhost" type="get" xmlns="jabber:client">`+
|
|
|
- `<query xmlns="http://jabber.org/protocol/disco#info"/>`+
|
|
|
- `</iq>`);
|
|
|
-
|
|
|
- // Upload service responds and reports a maximum file size of 5MiB
|
|
|
- stanza = $iq({'type': 'result', 'to': 'dummy@localhost/resource', 'id': IQ_id, 'from': 'upload.localhost'})
|
|
|
- .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));
|
|
|
- return _converse.api.disco.entities.get();
|
|
|
- }).then(function (entities) {
|
|
|
- expect(entities.get('localhost').items.get('upload.localhost').identities.where({'category': 'store'}).length).toBe(1);
|
|
|
- return _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain);
|
|
|
- }).then(function (result) {
|
|
|
- test_utils.createContacts(_converse, 'current');
|
|
|
- _converse.emit('rosterContactsFetched');
|
|
|
+ }).length > 0;
|
|
|
+ }, 300);
|
|
|
|
|
|
- contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@localhost';
|
|
|
- return test_utils.openChatBoxFor(_converse, contact_jid);
|
|
|
- }).then(() => {
|
|
|
- view = _converse.chatboxviews.get(contact_jid);
|
|
|
- var file = {
|
|
|
- 'type': 'image/jpeg',
|
|
|
- 'size': '5242881',
|
|
|
- 'lastModifiedDate': "",
|
|
|
- 'name': "my-juliet.jpg"
|
|
|
- };
|
|
|
- view.model.sendFiles([file]);
|
|
|
- return test_utils.waitUntil(() => view.el.querySelectorAll('.message').length)
|
|
|
- }).then(function () {
|
|
|
- const messages = view.el.querySelectorAll('.message.chat-error');
|
|
|
- expect(messages.length).toBe(1);
|
|
|
- expect(messages[0].textContent).toBe(
|
|
|
- 'The size of your file, my-juliet.jpg, exceeds the maximum allowed by your server, which is 5 MB.');
|
|
|
- done();
|
|
|
- }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL))
|
|
|
+ stanza = _.find(IQ_stanzas, function (iq) {
|
|
|
+ return iq.nodeTree.querySelector('iq[to="upload.localhost"] query[xmlns="http://jabber.org/protocol/disco#info"]');
|
|
|
+ });
|
|
|
+ var IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
|
|
|
+ expect(stanza.toLocaleString()).toBe(
|
|
|
+ `<iq from="dummy@localhost/resource" id="${IQ_id}" to="upload.localhost" type="get" xmlns="jabber:client">`+
|
|
|
+ `<query xmlns="http://jabber.org/protocol/disco#info"/>`+
|
|
|
+ `</iq>`);
|
|
|
+
|
|
|
+ // Upload service responds and reports a maximum file size of 5MiB
|
|
|
+ stanza = $iq({'type': 'result', 'to': 'dummy@localhost/resource', 'id': IQ_id, 'from': 'upload.localhost'})
|
|
|
+ .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();
|
|
|
+ expect(entities.get('localhost').items.get('upload.localhost').identities.where({'category': 'store'}).length).toBe(1);
|
|
|
+ const result = await _converse.api.disco.supports(Strophe.NS.HTTPUPLOAD, _converse.domain);
|
|
|
+ test_utils.createContacts(_converse, 'current');
|
|
|
+ _converse.emit('rosterContactsFetched');
|
|
|
+
|
|
|
+ const contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@localhost';
|
|
|
+ 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]);
|
|
|
+ await test_utils.waitUntil(() => view.el.querySelectorAll('.message').length)
|
|
|
+ const messages = view.el.querySelectorAll('.message.chat-error');
|
|
|
+ expect(messages.length).toBe(1);
|
|
|
+ expect(messages[0].textContent).toBe(
|
|
|
+ 'The size of your file, my-juliet.jpg, exceeds the maximum allowed by your server, which is 5 MB.');
|
|
|
+ done();
|
|
|
}));
|
|
|
});
|
|
|
});
|
JC Brand