paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin user list: Replace the buttons with icons.

Browse Source 
1. Replaced the deactivate and reactivate buttons with icons.
2. Added (you) near the current user name to denote his/her account in
the entire user list.

Tweaked by tabbott to reuse the (you) formatting from the right
sidebar here for readability and consistency.

Fixes #6313.
This commit is contained in:
Jagan
2020-04-06 10:45:39 +05:30
committed by Tim Abbott
parent 09ea778db1
commit c69dc720ff
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frontend_tests/casper_tests/13-user-deactivation.js
View File

@@ -25,7 +25,7 @@ casper.then(function () {
// Test user deactivation and reactivation
casper.then(function () {
casper.waitUntilVisible(user_row('cordelia'), function () {
casper.test.assertSelectorHasText(user_row('cordelia'), 'Deactivate');
casper.test.assertExists('.fa-user-times', 'Deactivate icon available');
casper.click(user_row('cordelia') + ' .deactivate');
casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user');
casper.test.assertTextExists('Deactivate now', 'Deactivate now button available');
@@ -35,21 +35,21 @@ casper.then(function () {
casper.then(function () {
casper.waitUntilVisible(user_row('cordelia') + '.deactivated_user', function () {
casper.test.assertSelectorHasText(user_row('cordelia'), 'Reactivate');
casper.test.assertExists('.fa-user-plus', 'Reactivate icon available');
casper.click(user_row('cordelia') + ' .reactivate');
});
});
casper.then(function () {
casper.waitUntilVisible(user_row('cordelia') + ':not(.deactivated_user)', function () {
casper.test.assertSelectorHasText(user_row('cordelia'), 'Deactivate');
casper.test.assertExists('.fa-user-times', 'Deactivate icon available');
});
});
casper.then(function () {
// Test Deactivated users section of admin page
casper.waitUntilVisible(user_row('cordelia'), function () {
casper.test.assertSelectorHasText(user_row('cordelia'), 'Deactivate');
casper.test.assertExists('.fa-user-times', 'Deactivate icon available');
casper.click(user_row('cordelia') + ' .deactivate');
casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user');
casper.test.assertTextExists('Deactivate now', 'Deactivate now button available');
@@ -66,14 +66,14 @@ casper.then(function () {
casper.waitUntilVisible('#admin_deactivated_users_table ' + user_row('cordelia') + ' .reactivate', function () {
casper.test.assertSelectorHasText('#admin_deactivated_users_table ' + user_row('cordelia') + '', 'Reactivate');
casper.test.assertExists('.fa-user-plus', 'Reactive icon available');
casper.click('#admin_deactivated_users_table ' + user_row('cordelia') + ' .reactivate');
});
});
casper.then(function () {
casper.waitUntilVisible('#admin_deactivated_users_table ' + user_row('cordelia') + ' button:not(.reactivate)', function () {
casper.test.assertSelectorHasText('#admin_deactivated_users_table ' + user_row('cordelia') + '', 'Deactivate');
casper.test.assertExists('.fa-user-times', 'Deactivate icon available');
});
});
@@ -85,21 +85,21 @@ casper.then(function () {
casper.then(function () {
casper.waitUntilVisible(user_row('default-bot'), function () {
casper.test.assertSelectorHasText(user_row('default-bot'), 'Deactivate');
casper.test.assertExists('.fa-user-times', 'Deactivate icon available');
casper.click(user_row('default-bot') + ' .deactivate');
});
});
casper.then(function () {
casper.waitUntilVisible(user_row('default-bot') + '.deactivated_user', function () {
casper.test.assertSelectorHasText(user_row('default-bot'), 'Reactivate');
casper.test.assertExists('.fa-user-plus', 'Reactivate icon available');
casper.click(user_row('default-bot') + ' .reactivate');
});
});
casper.then(function () {
casper.waitUntilVisible(user_row('default-bot') + ':not(.deactivated_user)', function () {
casper.test.assertSelectorHasText(user_row('default-bot'), 'Deactivate');
casper.test.assertExists('.fa-user-times', 'Deactivate icon available');
});
});