Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_subs: Improve readability of URLs that have request params.

This commit is contained in:
Clara Dantas 2020-07-29 19:43:58 -03:00 committed by Tim Abbott
parent 6b011b241b
commit ca2123fec1
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zerver/tests/test_subs.py
View File

@ -2,6 +2,7 @@ import random
from datetime import timedelta from datetime import timedelta
from typing import Any, Dict, List, Mapping, Optional, Sequence, Set, Union from typing import Any, Dict, List, Mapping, Optional, Sequence, Set, Union
from unittest import mock from unittest import mock
from urllib.parse import urlencode
import ujson import ujson
from django.conf import settings from django.conf import settings
@ -3527,9 +3528,15 @@ class GetStreamsTest(ZulipTestCase):
# Check it correctly lists the bot owner's subs with # Check it correctly lists the bot owner's subs with
# include_owner_subscribed=true # include_owner_subscribed=true
filters = dict(
include_owner_subscribed = "true",
include_public = "false",
include_subscribed = "false",
)
request_variables = urlencode(filters)
result = self.api_get( result = self.api_get(
test_bot, test_bot,
"/api/v1/streams?include_owner_subscribed=true&include_public=false&include_subscribed=false") f"/api/v1/streams?{request_variables}")
owner_subs = self.api_get(hamlet, "/api/v1/users/me/subscriptions") owner_subs = self.api_get(hamlet, "/api/v1/users/me/subscriptions")
self.assert_json_success(result) self.assert_json_success(result)
@ -3546,9 +3553,15 @@ class GetStreamsTest(ZulipTestCase):
# Check it correctly lists the bot owner's subs and the # Check it correctly lists the bot owner's subs and the
# bot's subs # bot's subs
self.subscribe(test_bot, 'Scotland') self.subscribe(test_bot, 'Scotland')
filters = dict(
include_owner_subscribed = "true",
include_public = "false",
include_subscribed = "true",
)
request_variables = urlencode(filters)
result = self.api_get( result = self.api_get(
test_bot, test_bot,
"/api/v1/streams?include_owner_subscribed=true&include_public=false&include_subscribed=true", f"/api/v1/streams?{request_variables}",
) )
self.assert_json_success(result) self.assert_json_success(result)
@ -3671,7 +3684,12 @@ class GetStreamsTest(ZulipTestCase):
sorted([s["name"] for s in json2["subscriptions"]])) sorted([s["name"] for s in json2["subscriptions"]]))
# Check it correctly lists all public streams with include_subscribed=false # Check it correctly lists all public streams with include_subscribed=false
result = self.api_get(user, "/api/v1/streams?include_public=true&include_subscribed=false") filters = dict(
include_public = "true",
include_subscribed = "false"
)
request_variables = urlencode(filters)
result = self.api_get(user, f"/api/v1/streams?{request_variables}")
self.assert_json_success(result) self.assert_json_success(result)
json = result.json() json = result.json()