Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
935ca52b
Commit
935ca52b
authored
Dec 15, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test that open groupchats are shown with their bookmarked names
parent
d5485d09
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
84 additions
and
28 deletions
+84
-28
dist/converse.js
dist/converse.js
+8
-12
spec/roomslist.js
spec/roomslist.js
+69
-9
src/converse-roomslist.js
src/converse-roomslist.js
+6
-6
tests/utils.js
tests/utils.js
+1
-1
No files found.
dist/converse.js
View file @
935ca52b
...
@@ -58580,7 +58580,10 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
...
@@ -58580,7 +58580,10 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
* loaded by converse.js's plugin machinery.
* loaded by converse.js's plugin machinery.
*/
*/
const _converse = this._converse,
const _converse = this._converse,
__ = _converse.__;
__ = _converse.__; // Promises exposed by this plugin
_converse.api.promises.add('roomsListInitialized');
_converse.OpenRooms = Backbone.Collection.extend({
_converse.OpenRooms = Backbone.Collection.extend({
comparator(room) {
comparator(room) {
if (room.get('bookmarked')) {
if (room.get('bookmarked')) {
...
@@ -58840,23 +58843,16 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
...
@@ -58840,23 +58843,16 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
_converse.rooms_list_view = new _converse.RoomsListView({
_converse.rooms_list_view = new _converse.RoomsListView({
'model': model
'model': model
});
});
_converse.api.emit('roomsListInitialized');
};
};
if (_converse.allow_bookmarks) {
if (_converse.allow_bookmarks) {
u.onMultipleEvents([{
_converse.api.waitUntil('bookmarksInitialized').then(initRoomsListView);
'object': _converse,
'event': 'chatBoxesFetched'
}, {
'object': _converse,
'event': 'roomsPanelRendered'
}, {
'object': _converse,
'event': 'bookmarksInitialized'
}], initRoomsListView);
} else {
} else {
u.onMultipleEvents([{
u.onMultipleEvents([{
'object': _converse,
'object': _converse,
'event': 'chatBoxes
Fetch
ed'
'event': 'chatBoxes
Initializ
ed'
}, {
}, {
'object': _converse,
'object': _converse,
'event': 'roomsPanelRendered'
'event': 'roomsPanelRendered'
spec/roomslist.js
View file @
935ca52b
(
function
(
root
,
factory
)
{
(
function
(
root
,
factory
)
{
define
([
"
jasmine
"
,
"
mock
"
,
"
test-utils
"
],
factory
);
define
([
"
jasmine
"
,
"
mock
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
jasmine
,
mock
,
test_utils
)
{
}
(
this
,
function
(
jasmine
,
mock
,
test_utils
)
{
var
_
=
converse
.
env
.
_
;
const
{
Backbone
,
Promise
,
Strophe
,
$iq
,
$msg
,
$pres
,
b64_sha1
,
sizzle
,
_
}
=
converse
.
env
;
var
$msg
=
converse
.
env
.
$msg
;
const
u
=
converse
.
env
.
utils
;
var
$iq
=
converse
.
env
.
$iq
;
var
$pres
=
converse
.
env
.
$pres
;
var
Promise
=
converse
.
env
.
Promise
;
var
Strophe
=
converse
.
env
.
Strophe
;
var
u
=
converse
.
env
.
utils
;
describe
(
"
A list of open rooms
"
,
function
()
{
it
(
"
is shown in the
\"
Rooms
\"
panel
"
,
mock
.
initConverseWithPromises
(
describe
(
"
A list of open groupchats
"
,
function
()
{
it
(
"
is shown in controlbox
"
,
mock
.
initConverseWithPromises
(
null
,
[
'
rosterGroupsFetched
'
,
'
chatBoxesFetched
'
],
null
,
[
'
rosterGroupsFetched
'
,
'
chatBoxesFetched
'
],
{
allow_bookmarks
:
false
// Makes testing easier, otherwise we
{
allow_bookmarks
:
false
// Makes testing easier, otherwise we
// have to mock stanza traffic.
// have to mock stanza traffic.
...
@@ -49,6 +45,70 @@
...
@@ -49,6 +45,70 @@
done
();
done
();
}
}
));
));
it
(
"
uses bookmarks to determine groupchat names
"
,
mock
.
initConverseWithPromises
(
[
'
send
'
],
[
'
rosterGroupsFetched
'
,
'
chatBoxesFetched
'
],
{
'
view_mode
'
:
'
fullscreen
'
},
async
function
(
done
,
_converse
)
{
await
test_utils
.
openAndEnterChatRoom
(
_converse
,
'
lounge
'
,
'
localhost
'
,
'
dummy
'
);
const
view
=
_converse
.
chatboxviews
.
get
(
'
lounge@localhost
'
);
const
contact_jid
=
'
newguy@localhost
'
;
let
stanza
=
$pres
({
to
:
'
dummy@localhost/resource
'
,
from
:
'
lounge@localhost/newguy
'
})
.
c
(
'
x
'
,
{
xmlns
:
Strophe
.
NS
.
MUC_USER
})
.
c
(
'
item
'
,
{
'
affiliation
'
:
'
none
'
,
'
jid
'
:
'
newguy@localhost/_converse.js-290929789
'
,
'
role
'
:
'
participant
'
}).
tree
();
_converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
stanza
));
spyOn
(
_converse
.
Bookmarks
.
prototype
,
'
fetchBookmarks
'
).
and
.
callThrough
();
await
test_utils
.
waitUntilDiscoConfirmed
(
_converse
,
_converse
.
bare_jid
,
[{
'
category
'
:
'
pubsub
'
,
'
type
'
:
'
pep
'
}],
[
`
${
Strophe
.
NS
.
PUBSUB
}
#publish-options`
]
);
const
call
=
await
test_utils
.
waitUntil
(()
=>
_
.
filter
(
_converse
.
connection
.
send
.
calls
.
all
(),
c
=>
sizzle
(
'
items[node="storage:bookmarks"]
'
,
c
.
args
[
0
]).
length
).
pop
()
);
expect
(
Strophe
.
serialize
(
call
.
args
[
0
])).
toBe
(
`<iq from="dummy@localhost/resource" id="
${
call
.
args
[
0
].
getAttribute
(
'
id
'
)}
" type="get" xmlns="jabber:client">`
+
'
<pubsub xmlns="http://jabber.org/protocol/pubsub">
'
+
'
<items node="storage:bookmarks"/>
'
+
'
</pubsub>
'
+
'
</iq>
'
);
stanza
=
$iq
({
'
to
'
:
_converse
.
connection
.
jid
,
'
type
'
:
'
result
'
,
'
id
'
:
call
.
args
[
0
].
getAttribute
(
'
id
'
)})
.
c
(
'
pubsub
'
,
{
'
xmlns
'
:
Strophe
.
NS
.
PUBSUB
})
.
c
(
'
items
'
,
{
'
node
'
:
'
storage:bookmarks
'
})
.
c
(
'
item
'
,
{
'
id
'
:
'
current
'
})
.
c
(
'
storage
'
,
{
'
xmlns
'
:
'
storage:bookmarks
'
})
.
c
(
'
conference
'
,
{
'
name
'
:
'
Bookmarked Lounge
'
,
'
jid
'
:
'
lounge@localhost
'
});
_converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
stanza
));
await
_converse
.
api
.
waitUntil
(
'
roomsListInitialized
'
);
const
controlbox
=
_converse
.
chatboxviews
.
get
(
'
controlbox
'
);
const
list
=
controlbox
.
el
.
querySelector
(
'
div.rooms-list-container
'
);
expect
(
_
.
includes
(
list
.
classList
,
'
hidden
'
)).
toBeFalsy
();
const
items
=
list
.
querySelectorAll
(
'
.list-item
'
);
expect
(
items
.
length
).
toBe
(
1
);
expect
(
items
[
0
].
textContent
.
trim
()).
toBe
(
'
Bookmarked Lounge
'
);
expect
(
_converse
.
bookmarks
.
fetchBookmarks
).
toHaveBeenCalled
();
done
();
}));
});
});
describe
(
"
A groupchat shown in the groupchats list
"
,
function
()
{
describe
(
"
A groupchat shown in the groupchats list
"
,
function
()
{
...
...
src/converse-roomslist.js
View file @
935ca52b
...
@@ -40,6 +40,9 @@ converse.plugins.add('converse-roomslist', {
...
@@ -40,6 +40,9 @@ converse.plugins.add('converse-roomslist', {
const
{
_converse
}
=
this
,
const
{
_converse
}
=
this
,
{
__
}
=
_converse
;
{
__
}
=
_converse
;
// Promises exposed by this plugin
_converse
.
api
.
promises
.
add
(
'
roomsListInitialized
'
);
_converse
.
OpenRooms
=
Backbone
.
Collection
.
extend
({
_converse
.
OpenRooms
=
Backbone
.
Collection
.
extend
({
...
@@ -266,17 +269,14 @@ converse.plugins.add('converse-roomslist', {
...
@@ -266,17 +269,14 @@ converse.plugins.add('converse-roomslist', {
model
.
browserStorage
=
new
Backbone
.
BrowserStorage
[
storage
](
id
);
model
.
browserStorage
=
new
Backbone
.
BrowserStorage
[
storage
](
id
);
_converse
.
rooms_list_view
=
new
_converse
.
RoomsListView
({
'
model
'
:
model
});
_converse
.
rooms_list_view
=
new
_converse
.
RoomsListView
({
'
model
'
:
model
});
_converse
.
api
.
emit
(
'
roomsListInitialized
'
);
};
};
if
(
_converse
.
allow_bookmarks
)
{
if
(
_converse
.
allow_bookmarks
)
{
u
.
onMultipleEvents
([
_converse
.
api
.
waitUntil
(
'
bookmarksInitialized
'
).
then
(
initRoomsListView
);
{
'
object
'
:
_converse
,
'
event
'
:
'
chatBoxesFetched
'
},
{
'
object
'
:
_converse
,
'
event
'
:
'
roomsPanelRendered
'
},
{
'
object
'
:
_converse
,
'
event
'
:
'
bookmarksInitialized
'
}
],
initRoomsListView
);
}
else
{
}
else
{
u
.
onMultipleEvents
([
u
.
onMultipleEvents
([
{
'
object
'
:
_converse
,
'
event
'
:
'
chatBoxes
Fetch
ed
'
},
{
'
object
'
:
_converse
,
'
event
'
:
'
chatBoxes
Initializ
ed
'
},
{
'
object
'
:
_converse
,
'
event
'
:
'
roomsPanelRendered
'
}
{
'
object
'
:
_converse
,
'
event
'
:
'
roomsPanelRendered
'
}
],
initRoomsListView
);
],
initRoomsListView
);
}
}
...
...
tests/utils.js
View file @
935ca52b
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
}
}
utils
.
waitUntil
=
waitUntilPromise
.
default
;
utils
.
waitUntil
=
waitUntilPromise
.
default
;
utils
.
waitUntilDiscoConfirmed
=
async
function
(
_converse
,
entity_jid
,
identities
,
features
,
items
,
type
=
'
info
'
)
{
utils
.
waitUntilDiscoConfirmed
=
async
function
(
_converse
,
entity_jid
,
identities
,
features
=
[],
items
=
[]
,
type
=
'
info
'
)
{
const
iq
=
await
utils
.
waitUntil
(()
=>
{
const
iq
=
await
utils
.
waitUntil
(()
=>
{
return
_
.
filter
(
return
_
.
filter
(
_converse
.
connection
.
IQ_stanzas
,
_converse
.
connection
.
IQ_stanzas
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment