Skip to content

C
converse.js
Commit cb10c280 authored by JC Brand's avatar JC Brand
Browse files
Options

modtools: Test that error renders when not allowed to fetch affiliation list 

Also fix scrolling bug
parent 2ba2ce0c
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 41 deletions
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,56 +110,58 @@ ...@@ -110,56 +110,58 @@
</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">
<li class="list-group-item active"> <li class="list-group-item active">
<div><strong>JID:</strong> {{{item.jid}}}</div> <div><strong>JID:</strong> {{{item.jid}}}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<div><strong>Nickname:</strong> {{{item.nick}}}</div> <div><strong>Nickname:</strong> {{{item.nick}}}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<div><strong>Affiliation:</strong> {{{item.affiliation}}} <a href="#" data-form="affiliation-form" class="toggle-form right fa fa-wrench"></a></div> <div><strong>Affiliation:</strong> {{{item.affiliation}}} <a href="#" data-form="affiliation-form" class="toggle-form right fa fa-wrench"></a></div>
<form class="affiliation-form hidden"> <form class="affiliation-form hidden">
<div class="form-group"> <div class="form-group">
<input type="hidden" name="jid" value="{{{item.jid}}}"/> <input type="hidden" name="jid" value="{{{item.jid}}}"/>
<input type="hidden" name="nick" value="{{{item.nick}}}"/> <input type="hidden" name="nick" value="{{{item.nick}}}"/>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<label><strong>{{{o.__('New affiliation')}}}:</strong></label> <label><strong>{{{o.__('New affiliation')}}}:</strong></label>
<select class="custom-select select-affiliation" name="affiliation"> <select class="custom-select select-affiliation" name="affiliation">
{[ o.allowed_affiliations.forEach(function (aff) { ]} {[ o.allowed_affiliations.forEach(function (aff) { ]}
<option value="{{{aff}}}" {[ if (aff === item.affiliation) { ]} selected="selected" {[ } ]}>{{{aff}}}</option> <option value="{{{aff}}}" {[ if (aff === item.affiliation) { ]} selected="selected" {[ } ]}>{{{aff}}}</option>
{[ }); ]} {[ }); ]}
</select> </select>
</div> </div>
<div class="col"> <div class="col">
<label><strong>{{{o.__('Reason')}}}:</strong></label> <label><strong>{{{o.__('Reason')}}}:</strong></label>
<input class="form-control" type="text" name="reason"/> <input class="form-control" type="text" name="reason"/>
</div>
</div> </div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <input type="submit" class="btn btn-primary" name="change" value="{{{o.__('Change affiliation')}}}"/>
<input type="submit" class="btn btn-primary" name="change" value="{{{o.__('Change affiliation')}}}"/> </div>
</div> </form>
</form> </li>
</li> </ul>
</ul> </li>
</li> {[ }); ]}
{[ }); ]} {[ } ]}
{[ } ]} {[ } ]}
</ul> </ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7