tests: Adjust to new changes in populate_db.

matt- · Jul 31, 2019 · d3d62f9 · d3d62f9
1 parent 9b2b24c
commit d3d62f9
Show file tree

Hide file tree

Showing 36 changed files with 79 additions and 73 deletions.
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.create.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.save.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.save.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.create.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Customer.create.1.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/invoice_plan--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/renewal--Customer.create.1.json b/corporate/tests/stripe_fixtures/renewal--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.create.1.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.1.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.2.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.3.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.4.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.5.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.retrieve.6.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.save.2.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.save.2.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/replace_payment_source--Customer.save.3.json b/corporate/tests/stripe_fixtures/replace_payment_source--Customer.save.3.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.1.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/...te/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.create.1.json b/...te/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.2.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.create.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.retrieve.1.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.retrieve.2.json
@@ -39,7 +39,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.save.1.json b/corporate/tests/stripe_fixtures/upgrade_where_first_card_fails--Customer.save.1.json
@@ -15,7 +15,7 @@
   },
   "livemode": false,
   "metadata": {
-    "realm_id": "1",
+    "realm_id": "2",
     "realm_str": "zulip"
   },
   "object": "customer",

diff --git a/frontend_tests/casper_tests/10-admin.js b/frontend_tests/casper_tests/10-admin.js
@@ -432,7 +432,7 @@ casper.then(function () {
         }, false);
         casper.click("#realm_icon_upload_button");
         casper.waitWhileVisible("#upload_icon_spinner .loading_indicator_spinner", function () {
-            casper.test.assertExists('img#realm-settings-icon[src^="/user_avatars/1/realm/icon.png?version=2"]');
+            casper.test.assertExists('img#realm-settings-icon[src^="/user_avatars/2/realm/icon.png?version=2"]');
             casper.test.assertEqual(casper.visible('#realm_icon_delete_button'), true);
         });
     });

diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py
@@ -14,7 +14,7 @@
 from io import StringIO
 
 from zerver.models import (
-    get_client, get_stream_recipient, get_stream,
+    get_client, get_stream_recipient, get_stream, get_realm, get_system_bot,
     Message, RealmDomain, Recipient, UserMessage, UserPresence, UserProfile,
     Realm, Subscription, Stream, flush_per_request_caches, UserGroup, Service,
     Attachment, PreregistrationUser, get_user_by_delivery_email, MultiuseInvite
@@ -108,6 +108,7 @@
 from zerver.lib.events import (
     apply_events,
     fetch_initial_state_data,
+    get_raw_user_data,
     post_process_state,
 )
 from zerver.lib.message import (
@@ -2800,7 +2801,7 @@ def test_realm_bots_admin(self) -> None:
         do_change_is_admin(user_profile, True)
         self.assertTrue(user_profile.is_realm_admin)
         result = fetch_initial_state_data(user_profile, None, "", client_gravatar=False)
-        self.assertTrue(len(result['realm_bots']) > 5)
+        self.assertTrue(len(result['realm_bots']) > 2)
 
     def test_max_message_id_with_no_history(self) -> None:
         user_profile = self.example_user('aaron')
@@ -3614,3 +3615,12 @@ def test_use_narrow_if_default_is_none(self) -> None:
         self.user_profile.save()
         result = _default_narrow(self.user_profile, [])
         self.assertEqual(result, [])
+
+class TestGetRawUserDataSystemBotRealm(ZulipTestCase):
+    def test_get_raw_user_data_on_system_bot_realm(self) -> None:
+        result = get_raw_user_data(get_realm("zulipinternal"), True)
+
+        for bot_email in settings.CROSS_REALM_BOT_EMAILS:
+            bot_profile = get_system_bot(bot_email)
+            self.assertTrue(bot_profile.id in result)
+            self.assertTrue(result[bot_profile.id]['is_cross_realm_bot'])
diff --git a/zerver/tests/test_import_export.py b/zerver/tests/test_import_export.py
@@ -336,8 +336,8 @@ def test_export_files_from_local(self) -> None:
         self.assertEqual('1.png', os.listdir(fn)[0])
         records = full_data['emoji_dir_records']
         self.assertEqual(records[0]['file_name'], '1.png')
-        self.assertEqual(records[0]['path'], '1/emoji/images/1.png')
-        self.assertEqual(records[0]['s3_path'], '1/emoji/images/1.png')
+        self.assertEqual(records[0]['path'], '2/emoji/images/1.png')
+        self.assertEqual(records[0]['s3_path'], '2/emoji/images/1.png')
 
         # Test avatars
         fn = os.path.join(full_data['avatar_dir'], original_avatar_path_id)
@@ -386,8 +386,8 @@ def check_variable_type(user_profile_id: int, realm_id: int) -> None:
         records = full_data['emoji_dir_records']
         self.assertEqual(records[0]['file_name'], '1.png')
         self.assertTrue('last_modified' in records[0])
-        self.assertEqual(records[0]['path'], '1/emoji/images/1.png')
-        self.assertEqual(records[0]['s3_path'], '1/emoji/images/1.png')
+        self.assertEqual(records[0]['path'], '2/emoji/images/1.png')
+        self.assertEqual(records[0]['s3_path'], '2/emoji/images/1.png')
         check_variable_type(records[0]['user_profile_id'], records[0]['realm_id'])
 
         # Test avatars
@@ -415,13 +415,12 @@ def test_zulip_realm(self) -> None:
         realm_emoji.save()
 
         data = full_data['realm']
-        self.assertEqual(len(data['zerver_userprofile_crossrealm']), 0)
+        self.assertEqual(len(data['zerver_userprofile_crossrealm']), 3)
         self.assertEqual(len(data['zerver_userprofile_mirrordummy']), 0)
 
         exported_user_emails = self.get_set(data['zerver_userprofile'], 'email')
         self.assertIn(self.example_email('cordelia'), exported_user_emails)
         self.assertIn('[email protected]', exported_user_emails)
-        self.assertIn('[email protected]', exported_user_emails)
 
         exported_streams = self.get_set(data['zerver_stream'], 'name')
         self.assertEqual(
@@ -472,7 +471,6 @@ def test_export_realm_with_exportable_user_ids(self) -> None:
         self.assertIn(self.example_email('cordelia'), dummy_user_emails)
         self.assertIn(self.example_email('othello'), dummy_user_emails)
         self.assertIn('[email protected]', dummy_user_emails)
-        self.assertIn('[email protected]', dummy_user_emails)
         self.assertNotIn(self.example_email('iago'), dummy_user_emails)
         self.assertNotIn(self.example_email('hamlet'), dummy_user_emails)
 
@@ -541,7 +539,7 @@ def test_export_realm_with_member_consent(self) -> None:
 
         data = full_data['realm']
 
-        self.assertEqual(len(data['zerver_userprofile_crossrealm']), 0)
+        self.assertEqual(len(data['zerver_userprofile_crossrealm']), 3)
         self.assertEqual(len(data['zerver_userprofile_mirrordummy']), 0)
 
         exported_user_emails = self.get_set(data['zerver_userprofile'], 'email')
@@ -550,7 +548,6 @@ def test_export_realm_with_member_consent(self) -> None:
         self.assertIn(self.example_email('iago'), exported_user_emails)
         self.assertIn(self.example_email('othello'), exported_user_emails)
         self.assertIn('[email protected]', exported_user_emails)
-        self.assertIn('[email protected]', exported_user_emails)
 
         exported_streams = self.get_set(data['zerver_stream'], 'name')
         self.assertEqual(