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

tests: Add tests for creating a new stream with a description 

Modify backend test of create_streams_if_needed so that the newly
created streams have descriptions.

Modify casperjs test of filling out stream_creation_form so that
the newly created stream has a description.

Fixes: #2428.
This commit is contained in:
Calvin Lee 2016-11-27 09:31:53 -05:00 committed by Tim Abbott
parent e2270f5499
commit 5c262d3557
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend_tests/casper_tests/05-subscriptions.js
View File

@ -25,7 +25,7 @@ casper.waitForSelector('.sub_unsub_button.checked', function () {
}); });
casper.waitForSelector('#create_stream_button', function () { casper.waitForSelector('#create_stream_button', function () {
casper.test.assertTextExists('Create stream', 'Modal for specifying new stream users'); casper.test.assertTextExists('Create stream', 'Modal for specifying new stream users');
casper.fill('form#stream_creation_form', {stream_name: 'Waseemio'}); casper.fill('form#stream_creation_form', {stream_name: 'Waseemio', stream_description: 'Oimeesaw'});
casper.click('form#stream_creation_form button.btn.btn-primary'); casper.click('form#stream_creation_form button.btn.btn-primary');
}); });
casper.then(function () { casper.then(function () {
@ -68,6 +68,7 @@ casper.waitFor(function () {
casper.then(function () { casper.then(function () {
casper.test.info("User should be subscribed to stream Waseemio"); casper.test.info("User should be subscribed to stream Waseemio");
casper.test.assertSelectorHasText('.stream-name', 'Waseemio'); casper.test.assertSelectorHasText('.stream-name', 'Waseemio');
casper.test.assertSelectorHasText('.description', 'Oimeesaw');
casper.fill('form#add_new_subscription', {stream_name: 'WASeemio'}); casper.fill('form#add_new_subscription', {stream_name: 'WASeemio'});
casper.click('form#add_new_subscription input.btn'); casper.click('form#add_new_subscription input.btn');
}); });

21
zerver/tests/test_subs.py
View File

@ -53,33 +53,48 @@ import random
import ujson import ujson
import six import six
from six import text_type from six import text_type
from six.moves import range, urllib from six.moves import range, urllib, zip
class TestCreateStreams(ZulipTestCase): class TestCreateStreams(ZulipTestCase):
def test_creating_streams(self): def test_creating_streams(self):
# type: () -> None # type: () -> None
stream_names = [u'new1', u'new2', u'new3'] stream_names = [u'new1', u'new2', u'new3']
stream_descriptions = [u'des1', u'des2', u'des3']
realm = get_realm_by_string_id('zulip') realm = get_realm_by_string_id('zulip')
new_streams, existing_streams = create_streams_if_needed( new_streams, existing_streams = create_streams_if_needed(
realm, realm,
[{"name": stream_name, "invite_only": True} for stream_name in stream_names]) [{"name": stream_name,
"description": stream_description,
"invite_only": True}
for (stream_name, stream_description) in zip(stream_names, stream_descriptions)])
self.assertEqual(len(new_streams), 3) self.assertEqual(len(new_streams), 3)
self.assertEqual(len(existing_streams), 0) self.assertEqual(len(existing_streams), 0)
actual_stream_names = {stream.name for stream in new_streams} actual_stream_names = {stream.name for stream in new_streams}
self.assertEqual(actual_stream_names, set(stream_names)) self.assertEqual(actual_stream_names, set(stream_names))
actual_stream_descriptions = {stream.description for stream in new_streams}
self.assertEqual(actual_stream_descriptions, set(stream_descriptions))
for stream in new_streams:
self.assertTrue(stream.invite_only)
new_streams, existing_streams = create_streams_if_needed( new_streams, existing_streams = create_streams_if_needed(
realm, realm,
[{"name": stream_name, "invite_only": True} for stream_name in stream_names]) [{"name": stream_name,
"description": stream_description,
"invite_only": True}
for (stream_name, stream_description) in zip(stream_names, stream_descriptions)])
self.assertEqual(len(new_streams), 0) self.assertEqual(len(new_streams), 0)
self.assertEqual(len(existing_streams), 3) self.assertEqual(len(existing_streams), 3)
actual_stream_names = {stream.name for stream in existing_streams} actual_stream_names = {stream.name for stream in existing_streams}
self.assertEqual(actual_stream_names, set(stream_names)) self.assertEqual(actual_stream_names, set(stream_names))
actual_stream_descriptions = {stream.description for stream in existing_streams}
self.assertEqual(actual_stream_descriptions, set(stream_descriptions))
for stream in existing_streams:
self.assertTrue(stream.invite_only)
class RecipientTest(ZulipTestCase): class RecipientTest(ZulipTestCase):
def test_recipient(self): def test_recipient(self):