paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12833 from whoodes/clean-up-new-user-bot

Browse Source 
bots: Replace remnants of new-user-bot with default-bot@zulip.com.
This commit is contained in:
Wyatt Hoodes
2019-07-20 11:38:05 -10:00
committed by Tim Abbott
parent f96f7580ca
commit 9b69c1f7fe
6 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,22 +78,22 @@ casper.then(function () {
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[data-email="new-user-bot@zulip.com"]', function () { casper.waitUntilVisible('.user_row[data-email="default-bot@zulip.com"]', function () {
casper.test.assertSelectorHasText('.user_row[data-email="new-user-bot@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('.user_row[data-email="default-bot@zulip.com"]', 'Deactivate');
casper.click('.user_row[data-email="new-user-bot@zulip.com"] .deactivate'); casper.click('.user_row[data-email="default-bot@zulip.com"] .deactivate');
}); });
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[data-email="new-user-bot@zulip.com"].deactivated_user', function () { casper.waitUntilVisible('.user_row[data-email="default-bot@zulip.com"].deactivated_user', function () {
casper.test.assertSelectorHasText('.user_row[data-email="new-user-bot@zulip.com"]', 'Reactivate'); casper.test.assertSelectorHasText('.user_row[data-email="default-bot@zulip.com"]', 'Reactivate');
casper.click('.user_row[data-email="new-user-bot@zulip.com"] .reactivate'); casper.click('.user_row[data-email="default-bot@zulip.com"] .reactivate');
}); });
}); });
casper.then(function () { casper.then(function () {
casper.waitUntilVisible('.user_row[data-email="new-user-bot@zulip.com"]:not(.deactivated_user)', function () { casper.waitUntilVisible('.user_row[data-email="default-bot@zulip.com"]:not(.deactivated_user)', function () {
casper.test.assertSelectorHasText('.user_row[data-email="new-user-bot@zulip.com"]', 'Deactivate'); casper.test.assertSelectorHasText('.user_row[data-email="default-bot@zulip.com"]', 'Deactivate');
}); });
}); });

9
zerver/tests/test_home.py
View File

@@ -559,7 +559,7 @@ class HomeTest(ZulipTestCase):
self.assertNotIn('defunct-1@zulip.com', active_emails) self.assertNotIn('defunct-1@zulip.com', active_emails)
cross_bots = page_params['cross_realm_bots'] cross_bots = page_params['cross_realm_bots']
self.assertEqual(len(cross_bots), 5) self.assertEqual(len(cross_bots), 4)
cross_bots.sort(key=lambda d: d['email']) cross_bots.sort(key=lambda d: d['email'])
for cross_bot in cross_bots: for cross_bot in cross_bots:
# These are either nondeterministic or boring # These are either nondeterministic or boring
@@ -572,13 +572,6 @@ class HomeTest(ZulipTestCase):
by_email = lambda d: d['email'] by_email = lambda d: d['email']
self.assertEqual(sorted(cross_bots, key=by_email), sorted([ self.assertEqual(sorted(cross_bots, key=by_email), sorted([
dict(
user_id=get_user('new-user-bot@zulip.com', get_realm('zulip')).id,
is_admin=False,
email='new-user-bot@zulip.com',
full_name='Zulip New User Bot',
is_bot=True
),
dict( dict(
user_id=get_user('emailgateway@zulip.com', get_realm('zulip')).id, user_id=get_user('emailgateway@zulip.com', get_realm('zulip')).id,
is_admin=False, is_admin=False,

2
zerver/tests/test_presence.py
View File

@@ -361,7 +361,7 @@ class SingleUserPresenceTests(ZulipTestCase):
result = self.client_get("/json/users/cordelia@zulip.com/presence") result = self.client_get("/json/users/cordelia@zulip.com/presence")
self.assert_json_error(result, "No such user") self.assert_json_error(result, "No such user")
result = self.client_get("/json/users/new-user-bot@zulip.com/presence") result = self.client_get("/json/users/default-bot@zulip.com/presence")
self.assert_json_error(result, "Presence is not supported for bot users.") self.assert_json_error(result, "Presence is not supported for bot users.")
self.login(self.mit_email("sipbtest"), realm=get_realm("zephyr")) self.login(self.mit_email("sipbtest"), realm=get_realm("zephyr"))

4
zerver/tests/test_subs.py
View File

@@ -2366,7 +2366,7 @@ class SubscriptionAPITest(ZulipTestCase):
) )
self.assertNotIn(self.example_user('polonius').id, add_peer_event['users']) self.assertNotIn(self.example_user('polonius').id, add_peer_event['users'])
self.assertEqual(len(add_peer_event['users']), 17) self.assertEqual(len(add_peer_event['users']), 16)
self.assertEqual(add_peer_event['event']['type'], 'subscription') self.assertEqual(add_peer_event['event']['type'], 'subscription')
self.assertEqual(add_peer_event['event']['op'], 'peer_add') self.assertEqual(add_peer_event['event']['op'], 'peer_add')
self.assertEqual(add_peer_event['event']['user_id'], self.user_profile.id) self.assertEqual(add_peer_event['event']['user_id'], self.user_profile.id)
@@ -2398,7 +2398,7 @@ class SubscriptionAPITest(ZulipTestCase):
# We don't send a peer_add event to othello # We don't send a peer_add event to othello
self.assertNotIn(user_profile.id, add_peer_event['users']) self.assertNotIn(user_profile.id, add_peer_event['users'])
self.assertNotIn(self.example_user('polonius').id, add_peer_event['users']) self.assertNotIn(self.example_user('polonius').id, add_peer_event['users'])
self.assertEqual(len(add_peer_event['users']), 17) self.assertEqual(len(add_peer_event['users']), 16)
self.assertEqual(add_peer_event['event']['type'], 'subscription') self.assertEqual(add_peer_event['event']['type'], 'subscription')
self.assertEqual(add_peer_event['event']['op'], 'peer_add') self.assertEqual(add_peer_event['event']['op'], 'peer_add')
self.assertEqual(add_peer_event['event']['user_id'], user_profile.id) self.assertEqual(add_peer_event['event']['user_id'], user_profile.id)

1
zilencer/management/commands/populate_db.py
View File

@@ -218,7 +218,6 @@ class Command(BaseCommand):
all_realm_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,)) all_realm_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
for bot in settings.INTERNAL_BOTS] for bot in settings.INTERNAL_BOTS]
zulip_realm_bots = [ zulip_realm_bots = [
("Zulip New User Bot", "new-user-bot@zulip.com"),
("Zulip Error Bot", "error-bot@zulip.com"), ("Zulip Error Bot", "error-bot@zulip.com"),
("Zulip Default Bot", "default-bot@zulip.com"), ("Zulip Default Bot", "default-bot@zulip.com"),
("Welcome Bot", "welcome-bot@zulip.com"), ("Welcome Bot", "welcome-bot@zulip.com"),

1
zproject/settings.py
View File

@@ -1397,7 +1397,6 @@ CROSS_REALM_BOT_EMAILS = {
'feedback@zulip.com', 'feedback@zulip.com',
'notification-bot@zulip.com', 'notification-bot@zulip.com',
'welcome-bot@zulip.com', 'welcome-bot@zulip.com',
'new-user-bot@zulip.com',
'emailgateway@zulip.com', 'emailgateway@zulip.com',
} }