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
cb10c280
Commit
cb10c280
authored
Aug 12, 2019
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modtools: Test that error renders when not allowed to fetch affiliation list
Also fix scrolling bug
parent
2ba2ce0c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
103 additions
and
41 deletions
+103
-41
spec/modtools.js
spec/modtools.js
+60
-0
src/templates/moderator_tools_modal.html
src/templates/moderator_tools_modal.html
+43
-41
No files found.
spec/modtools.js
View file @
cb10c280
...
@@ -135,5 +135,65 @@
...
@@ -135,5 +135,65 @@
expect
(
user_els
[
0
].
textContent
.
trim
()).
toBe
(
'
No users with that role found.
'
);
expect
(
user_els
[
0
].
textContent
.
trim
()).
toBe
(
'
No users with that role found.
'
);
done
();
done
();
}));
}));
it
(
"
shows an error message if a particular affiliation list may not be retrieved
"
,
mock
.
initConverse
(
null
,
[
'
rosterGroupsFetched
'
],
{},
async
function
(
done
,
_converse
)
{
spyOn
(
_converse
.
ChatRoomView
.
prototype
,
'
showModeratorToolsModal
'
).
and
.
callThrough
();
const
muc_jid
=
'
lounge@montague.lit
'
;
const
members
=
[
{
'
jid
'
:
'
hag66@shakespeare.lit
'
,
'
nick
'
:
'
witch
'
,
'
affiliation
'
:
'
member
'
},
{
'
jid
'
:
'
gower@shakespeare.lit
'
,
'
nick
'
:
'
gower
'
,
'
affiliation
'
:
'
member
'
},
{
'
jid
'
:
'
wiccarocks@shakespeare.lit
'
,
'
nick
'
:
'
wiccan
'
,
'
affiliation
'
:
'
admin
'
},
{
'
jid
'
:
'
crone1@shakespeare.lit
'
,
'
nick
'
:
'
thirdwitch
'
,
'
affiliation
'
:
'
owner
'
},
{
'
jid
'
:
'
romeo@montague.lit
'
,
'
nick
'
:
'
romeo
'
,
'
affiliation
'
:
'
owner
'
},
];
await
test_utils
.
openAndEnterChatRoom
(
_converse
,
muc_jid
,
'
romeo
'
,
[],
members
);
const
view
=
_converse
.
chatboxviews
.
get
(
muc_jid
);
await
u
.
waitUntil
(()
=>
(
view
.
model
.
occupants
.
length
===
5
));
const
textarea
=
view
.
el
.
querySelector
(
'
.chat-textarea
'
);
textarea
.
value
=
'
/modtools
'
;
const
enter
=
{
'
target
'
:
textarea
,
'
preventDefault
'
:
function
preventDefault
()
{},
'
keyCode
'
:
13
};
view
.
onKeyDown
(
enter
);
await
u
.
waitUntil
(()
=>
view
.
showModeratorToolsModal
.
calls
.
count
());
const
modal
=
view
.
modtools_modal
;
await
u
.
waitUntil
(()
=>
u
.
isVisible
(
modal
.
el
),
1000
);
const
tab
=
modal
.
el
.
querySelector
(
'
#affiliations-tab
'
);
// Clear so that we don't match older stanzas
_converse
.
connection
.
IQ_stanzas
=
[];
const
IQ_stanzas
=
_converse
.
connection
.
IQ_stanzas
;
tab
.
click
();
const
select
=
modal
.
el
.
querySelector
(
'
.select-affiliation
'
);
select
.
value
=
'
outcast
'
;
const
button
=
modal
.
el
.
querySelector
(
'
.btn-primary[name="users_with_affiliation"]
'
);
button
.
click
();
const
iq_query
=
await
u
.
waitUntil
(()
=>
_
.
filter
(
IQ_stanzas
,
s
=>
sizzle
(
`iq[to="
${
muc_jid
}
"] query[xmlns="
${
Strophe
.
NS
.
MUC_ADMIN
}
"] item[affiliation="outcast"]`
,
s
).
length
).
pop
());
const
error
=
u
.
toStanza
(
`<iq from="
${
muc_jid
}
"
id="
${
iq_query
.
getAttribute
(
'
id
'
)}
"
type="error"
to="
${
_converse
.
jid
}
">
<error type="auth">
<forbidden xmlns="
${
Strophe
.
NS
.
STANZAS
}
"/>
</error>
</iq>`
);
_converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
error
));
await
u
.
waitUntil
(()
=>
!
modal
.
loading_users_with_affiliation
);
const
user_els
=
modal
.
el
.
querySelectorAll
(
'
.list-group--users > li
'
);
expect
(
user_els
.
length
).
toBe
(
1
);
expect
(
user_els
[
0
].
textContent
.
trim
()).
toBe
(
'
Error: not allowed to fetch outcast list for MUC lounge@montague.lit
'
);
done
();
}));
});
});
}));
}));
src/templates/moderator_tools_modal.html
View file @
cb10c280
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
</ul>
</ul>
<div
class=
"tab-content"
>
<div
class=
"tab-content"
>
<div
class=
"tab-pane active"
id=
"roles-tabpanel"
role=
"tabpanel"
aria-labelledby=
"roles-tab"
>
<div
class=
"tab-pane
tab-pane--columns
active"
id=
"roles-tabpanel"
role=
"tabpanel"
aria-labelledby=
"roles-tab"
>
<form
class=
"converse-form query-role"
>
<form
class=
"converse-form query-role"
>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"role"
>
<label
for=
"role"
>
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
</div>
</div>
<div
class=
"tab-pane"
id=
"affiliations-tabpanel"
role=
"tabpanel"
aria-labelledby=
"affiliations-tab"
>
<div
class=
"tab-pane
tab-pane--columns
"
id=
"affiliations-tabpanel"
role=
"tabpanel"
aria-labelledby=
"affiliations-tab"
>
<form
class=
"converse-form query-affiliation"
>
<form
class=
"converse-form query-affiliation"
>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"affiliation"
>
<label
for=
"affiliation"
>
...
@@ -110,16 +110,16 @@
...
@@ -110,16 +110,16 @@
</div>
</div>
</div>
</div>
</form>
</form>
<div
class=
"scrollable-container"
>
<ul
class=
"list-group list-group--users"
>
<ul
class=
"list-group list-group--users"
>
{[ if (o.loading_users_with_affiliation) { ]}
{[ if (o.loading_users_with_affiliation) { ]}
<li
class=
"list-group-item"
>
<span
class=
"spinner fa fa-spinner centered"
/>
</li>
<li
class=
"list-group-item"
>
<span
class=
"spinner fa fa-spinner centered"
/>
</li>
{[ } else { ]}
{[ } else { ]}
{[ if (o.users_with_affiliation
&&
o.users_with_affiliation.length === 0) { ]}
{[ if (o.users_with_affiliation
&&
o.users_with_affiliation.length === 0) { ]}
<li
class=
"list-group-item"
>
{{{o.__('No users with that affiliation found.')}}}
</li>
<li
class=
"list-group-item"
>
{{{o.__('No users with that affiliation found.')}}}
</li>
{[ } ]}
{[ } else if (o.users_with_affiliation instanceof Error) { ]}
{[ if (o.users_with_affiliation instanceof Error) { ]}
<li
class=
"list-group-item"
>
{{{o.users_with_affiliation.message}}}
</li>
<li
class=
"list-group-item"
>
{{{o.users_with_affiliation.message}}}
</li>
{[ } ]}
{[ }
else {
]}
{[ (o.users_with_affiliation || []).forEach(function (item) { ]}
{[ (o.users_with_affiliation || []).forEach(function (item) { ]}
<li
class=
"list-group-item"
>
<li
class=
"list-group-item"
>
<ul
class=
"list-group"
>
<ul
class=
"list-group"
>
...
@@ -159,10 +159,12 @@
...
@@ -159,10 +159,12 @@
</li>
</li>
{[ }); ]}
{[ }); ]}
{[ } ]}
{[ } ]}
{[ } ]}
</ul>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
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