mirror of https://github.com/zulip/zulip.git
zerver/tests/test_realm: Fix not-avaliable video-chat-provider value.
This commit is contained in:
parent
243db9a22f
commit
bbff797a93
|
@ -533,6 +533,11 @@ class RealmAPITest(ZulipTestCase):
|
||||||
self.assert_json_success(result)
|
self.assert_json_success(result)
|
||||||
return get_realm('zulip') # refresh data
|
return get_realm('zulip') # refresh data
|
||||||
|
|
||||||
|
def update_with_api_multiple_value(self, data_dict: Dict[str, Any]) -> Realm:
|
||||||
|
result = self.client_patch('/json/realm', data_dict)
|
||||||
|
self.assert_json_success(result)
|
||||||
|
return get_realm('zulip') # refresh data
|
||||||
|
|
||||||
def do_test_realm_update_api(self, name: str) -> None:
|
def do_test_realm_update_api(self, name: str) -> None:
|
||||||
"""Test updating realm properties.
|
"""Test updating realm properties.
|
||||||
|
|
||||||
|
@ -558,23 +563,39 @@ class RealmAPITest(ZulipTestCase):
|
||||||
bot_creation_policy=[1, 2],
|
bot_creation_policy=[1, 2],
|
||||||
email_address_visibility=[Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE,
|
email_address_visibility=[Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE,
|
||||||
Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS],
|
Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS],
|
||||||
video_chat_provider=[u'Jitsi', u'Hangouts'],
|
video_chat_provider=[
|
||||||
|
dict(
|
||||||
|
video_chat_provider=ujson.dumps('Google Hangouts'),
|
||||||
|
google_hangouts_domain=ujson.dumps(u'zulip.com')
|
||||||
|
),
|
||||||
|
dict(
|
||||||
|
video_chat_provider=ujson.dumps('Jitsi'),
|
||||||
|
)
|
||||||
|
],
|
||||||
google_hangouts_domain=[u'zulip.com', u'zulip.org'],
|
google_hangouts_domain=[u'zulip.com', u'zulip.org'],
|
||||||
zoom_api_secret=[u"abc", u"xyz"],
|
zoom_api_secret=[u"abc", u"xyz"],
|
||||||
zoom_api_key=[u"abc", u"xyz"],
|
zoom_api_key=[u"abc", u"xyz"],
|
||||||
zoom_user_id=[u"example@example.com", u"example@example.org"]
|
zoom_user_id=[u"example@example.com", u"example@example.org"]
|
||||||
) # type: Dict[str, Any]
|
) # type: Dict[str, Any]
|
||||||
|
|
||||||
vals = test_values.get(name)
|
vals = test_values.get(name)
|
||||||
if Realm.property_types[name] is bool:
|
if Realm.property_types[name] is bool:
|
||||||
vals = bool_tests
|
vals = bool_tests
|
||||||
if vals is None:
|
if vals is None:
|
||||||
raise AssertionError('No test created for %s' % (name,))
|
raise AssertionError('No test created for %s' % (name,))
|
||||||
|
|
||||||
self.set_up_db(name, vals[0])
|
if name == 'video_chat_provider':
|
||||||
realm = self.update_with_api(name, vals[1])
|
self.set_up_db(name, vals[0][name])
|
||||||
self.assertEqual(getattr(realm, name), vals[1])
|
realm = self.update_with_api_multiple_value(vals[1])
|
||||||
realm = self.update_with_api(name, vals[0])
|
self.assertEqual(getattr(realm, name), ujson.loads(vals[1][name]))
|
||||||
self.assertEqual(getattr(realm, name), vals[0])
|
realm = self.update_with_api_multiple_value(vals[0])
|
||||||
|
self.assertEqual(getattr(realm, name), ujson.loads(vals[0][name]))
|
||||||
|
else:
|
||||||
|
self.set_up_db(name, vals[0])
|
||||||
|
realm = self.update_with_api(name, vals[1])
|
||||||
|
self.assertEqual(getattr(realm, name), vals[1])
|
||||||
|
realm = self.update_with_api(name, vals[0])
|
||||||
|
self.assertEqual(getattr(realm, name), vals[0])
|
||||||
|
|
||||||
@slow("Tests a dozen properties in a loop")
|
@slow("Tests a dozen properties in a loop")
|
||||||
def test_update_realm_properties(self) -> None:
|
def test_update_realm_properties(self) -> None:
|
||||||
|
|
Loading…
Reference in New Issue