-
-
Notifications
You must be signed in to change notification settings - Fork 778
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #3362: Don't create empty nick element in bookmarks
- Loading branch information
Showing
5 changed files
with
139 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /* global mock, converse */ | ||
|
|
||
| describe("A chat room", function () { | ||
|
|
||
| describe("when autojoin is set", function () { | ||
|
|
||
| it("will be be opened and joined automatically upon login", mock.initConverse( | ||
| [], {}, async function (_converse) { | ||
|
|
||
| await mock.waitForRoster(_converse, 'current', 0); | ||
| await mock.waitUntilBookmarksReturned(_converse); | ||
| spyOn(_converse.api.rooms, 'create').and.callThrough(); | ||
| const jid = '[email protected]'; | ||
| const model = _converse.bookmarks.create({ | ||
| 'jid': jid, | ||
| 'autojoin': false, | ||
| 'name': 'The Play', | ||
| 'nick': '' | ||
| }); | ||
| expect(_converse.api.rooms.create).not.toHaveBeenCalled(); | ||
| _converse.bookmarks.remove(model); | ||
| _converse.bookmarks.create({ | ||
| 'jid': jid, | ||
| 'autojoin': true, | ||
| 'name': 'Hamlet', | ||
| 'nick': '' | ||
| }); | ||
| expect(_converse.api.rooms.create).toHaveBeenCalled(); | ||
| })); | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
| describe("A bookmark", function () { | ||
|
|
||
| it("can be created and sends out a stanza", mock.initConverse( | ||
| ['connected', 'chatBoxesFetched'], {}, async function (_converse) { | ||
|
|
||
| await mock.waitForRoster(_converse, 'current', 0); | ||
| await mock.waitUntilBookmarksReturned(_converse); | ||
|
|
||
| const jid = _converse.session.get('jid'); | ||
| const muc1_jid = '[email protected]'; | ||
| const { Strophe, sizzle, u } = converse.env; | ||
|
|
||
| _converse.bookmarks.createBookmark({ | ||
| jid: muc1_jid, | ||
| autojoin: true, | ||
| name: 'Hamlet', | ||
| nick: '' | ||
| }); | ||
|
|
||
| const IQ_stanzas = _converse.api.connection.get().IQ_stanzas; | ||
| let sent_stanza = await u.waitUntil( | ||
| () => IQ_stanzas.filter(s => sizzle('item[id="current"]', s).length).pop()); | ||
|
|
||
| expect(Strophe.serialize(sent_stanza)).toBe( | ||
| `<iq from="${jid}" id="${sent_stanza.getAttribute('id')}" type="set" xmlns="jabber:client">`+ | ||
| '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ | ||
| '<publish node="storage:bookmarks">'+ | ||
| '<item id="current">'+ | ||
| '<storage xmlns="storage:bookmarks">'+ | ||
| `<conference autojoin="true" jid="${muc1_jid}" name="Hamlet"/>`+ | ||
| '</storage>'+ | ||
| '</item>'+ | ||
| '</publish>'+ | ||
| '<publish-options>'+ | ||
| '<x type="submit" xmlns="jabber:x:data">'+ | ||
| '<field type="hidden" var="FORM_TYPE">'+ | ||
| '<value>http://jabber.org/protocol/pubsub#publish-options</value>'+ | ||
| '</field>'+ | ||
| '<field var="pubsub#persist_items"><value>true</value></field>'+ | ||
| '<field var="pubsub#access_model"><value>whitelist</value></field>'+ | ||
| '</x>'+ | ||
| '</publish-options>'+ | ||
| '</pubsub>'+ | ||
| '</iq>'); | ||
|
|
||
|
|
||
| const muc2_jid = '[email protected]'; | ||
| _converse.bookmarks.createBookmark({ | ||
| jid: muc2_jid, | ||
| autojoin: true, | ||
| name: 'Balcony', | ||
| nick: 'romeo' | ||
| }); | ||
|
|
||
| sent_stanza = await u.waitUntil( | ||
| () => IQ_stanzas.filter(s => sizzle('item[id="current"] conference[name="Balcony"]', s).length).pop()); | ||
|
|
||
| expect(Strophe.serialize(sent_stanza)).toBe( | ||
| `<iq from="${jid}" id="${sent_stanza.getAttribute('id')}" type="set" xmlns="jabber:client">`+ | ||
| '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ | ||
| '<publish node="storage:bookmarks">'+ | ||
| '<item id="current">'+ | ||
| '<storage xmlns="storage:bookmarks">'+ | ||
| `<conference autojoin="true" jid="${muc2_jid}" name="Balcony">`+ | ||
| '<nick>romeo</nick>'+ | ||
| '</conference>'+ | ||
| `<conference autojoin="true" jid="${muc1_jid}" name="Hamlet"/>`+ | ||
| '</storage>'+ | ||
| '</item>'+ | ||
| '</publish>'+ | ||
| '<publish-options>'+ | ||
| '<x type="submit" xmlns="jabber:x:data">'+ | ||
| '<field type="hidden" var="FORM_TYPE">'+ | ||
| '<value>http://jabber.org/protocol/pubsub#publish-options</value>'+ | ||
| '</field>'+ | ||
| '<field var="pubsub#persist_items"><value>true</value></field>'+ | ||
| '<field var="pubsub#access_model"><value>whitelist</value></field>'+ | ||
| '</x>'+ | ||
| '</publish-options>'+ | ||
| '</pubsub>'+ | ||
| '</iq>'); | ||
| })); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -187,7 +187,8 @@ describe("A chat room", function () { | |
| expect(room.get('nick')).toBe('Othello'); | ||
| })); | ||
|
|
||
| it("displays that it's bookmarked through its bookmark icon", mock.initConverse([], {}, async function (_converse) { | ||
| it("displays that it's bookmarked through its bookmark icon", | ||
| mock.initConverse([], {}, async function (_converse) { | ||
|
|
||
| const { u } = converse.env; | ||
| await mock.waitForRoster(_converse, 'current', 0); | ||
|
|
@@ -293,33 +294,6 @@ describe("A chat room", function () { | |
| ); | ||
| })); | ||
| }); | ||
|
|
||
| describe("and when autojoin is set", function () { | ||
|
|
||
| it("will be be opened and joined automatically upon login", mock.initConverse( | ||
| [], {}, async function (_converse) { | ||
|
|
||
| await mock.waitForRoster(_converse, 'current', 0); | ||
| await mock.waitUntilBookmarksReturned(_converse); | ||
| spyOn(_converse.api.rooms, 'create').and.callThrough(); | ||
| const jid = '[email protected]'; | ||
| const model = _converse.bookmarks.create({ | ||
| 'jid': jid, | ||
| 'autojoin': false, | ||
| 'name': 'The Play', | ||
| 'nick': '' | ||
| }); | ||
| expect(_converse.api.rooms.create).not.toHaveBeenCalled(); | ||
| _converse.bookmarks.remove(model); | ||
| _converse.bookmarks.create({ | ||
| 'jid': jid, | ||
| 'autojoin': true, | ||
| 'name': 'Hamlet', | ||
| 'nick': '' | ||
| }); | ||
| expect(_converse.api.rooms.create).toHaveBeenCalled(); | ||
| })); | ||
| }); | ||
| }); | ||
|
|
||
| describe("Bookmarks", function () { | ||
|
|
@@ -407,7 +381,9 @@ describe("Bookmarks", function () { | |
| _converse.api.connection.get()._dataRecv(mock.createRequest(stanza)); | ||
|
|
||
| await u.waitUntil(() => _converse.bookmarks.length === 3); | ||
| expect(_converse.bookmarks.map(b => b.get('name'))).toEqual(['Second bookmark', 'The Play's the Thing', 'Yet another bookmark']); | ||
| expect(_converse.bookmarks.map(b => b.get('name'))).toEqual( | ||
| ['Second bookmark', 'The Play's the Thing', 'Yet another bookmark'] | ||
| ); | ||
| expect(_converse.chatboxviews.get('[email protected]')).not.toBeUndefined(); | ||
| expect(Object.keys(_converse.chatboxviews.getAll()).length).toBe(2); | ||
| })); | ||
|
|
@@ -468,7 +444,7 @@ describe("Bookmarks", function () { | |
| expect(_converse.bookmarks.models.length).toBe(0); | ||
|
|
||
| spyOn(_converse.bookmarks, 'onBookmarksReceived').and.callThrough(); | ||
| var stanza = $iq({'to': _converse.api.connection.get().jid, 'type':'result', 'id':sent_stanza.getAttribute('id')}) | ||
| const stanza = $iq({'to': _converse.api.connection.get().jid, 'type':'result', 'id':sent_stanza.getAttribute('id')}) | ||
| .c('pubsub', {'xmlns': Strophe.NS.PUBSUB}) | ||
| .c('items', {'node': 'storage:bookmarks'}) | ||
| .c('item', {'id': 'current'}) | ||
|
|
||