Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,861 Commits 28 Branches 143 Tags 626 MiB
Commit Graph

119 Commits

Author SHA1 Message Date
Zev Benjamin 195bdb07c9 Unify huddles and personals into private messages on the send path 
Personals are now just private messages between two people (which
sometimes manifests as a private message with one recipient).  The
new message type on the send path is 'private'.  Note that the receive
path still has 'personal' and 'huddle' message types.

(imported from commit 97a438ef5c0b3db4eb3e6db674ea38a081265dd3)
 2012-11-13 15:40:53 -05:00
Keegan McAllister 31496e9189 Generalize Tornado-related settings 
(imported from commit 76a1338a87e1a6663aa7602a499e2d769814bf08)
 2012-11-13 10:59:02 -05:00
Tim Abbott 30b43ebee2 Uniformize /json/ and /api/ URLs to end with no trailing slash. 
(imported from commit c35b30bcc43982db3a2f774ea69269e5424a6159)
 2012-11-09 14:30:10 -05:00
Zev Benjamin 565edc3c5a Fix tests failing due to changes in error message text 
(imported from commit 1b0a869d427b33a0e8fcec4e2aa083bd94eee640)
 2012-11-09 14:21:06 -05:00
Tim Abbott 831316c6a6 Fix tests failing due to new activity tracking. 
(imported from commit 9c7ddfd4ad40cd2dfd38ac41537e058e02797085)
 2012-11-09 14:16:52 -05:00
Keegan McAllister 3b8dbbc7d7 Use django.utils.timezone.now consistently 
(imported from commit f223d9c1f6c77012db342b8be7aaed964b9f18c6)
 2012-11-07 18:51:33 -05:00
Keegan McAllister 0d538d91ac test: Fail if generate-fixtures fails 
(imported from commit b13167ad04837cfeb64989ff43fec2e6ae890a33)
 2012-11-07 17:46:46 -05:00
Jessica McKellar 9eb86df03a tests: Unbreak registration, which was missing the new TOS field. 
Also remove unused fields.

The registration tests should be revamped for our new multi-stage
signup, but for now just get the test suite passing completely.

(imported from commit 481f420cf99341e44e71942ae563e3f9a1270d3e)
 2012-11-05 10:32:42 -05:00
Keegan McAllister ac6a74bd73 test_public_urls: Fix docstring 
(imported from commit 18bf6595386ca65e0a928c9e0b60e8e0a46f77e2)
 2012-11-02 14:57:38 -04:00
Keegan McAllister cb9cdf22c3 tests: Correct documentation on test_message_to_nonexistent_stream 
(imported from commit 76176083c1a0494856a3507214e2cfc3844d1fc1)
 2012-11-01 12:08:38 -04:00
Tim Abbott 30aab26ccd Fix test_missing_last_received to match current behavior. 
(imported from commit 101b08d740ddf46d100c9763f2b78b86e2b07a00)
 2012-10-30 16:59:25 -04:00
Tim Abbott 70f21f9d8e Fix 'Stream does not exist' test. 
(imported from commit d4f0f3deaa3cc4b9cab67c90b87aa8bff2e72653)
 2012-10-30 16:59:25 -04:00
Keegan McAllister 7267ba9cd2 Fix test for /accounts/logout 
(imported from commit 256929fc4d462832358c31c99bd470a23ffaba29)
 2012-10-30 00:18:01 -04:00
Tim Abbott 8510f4e207 tests: Add a mocked session object for tornado tests. 
(imported from commit 0431d4cbb2233b7136367ad33f04ed2cc219add2)
 2012-10-29 14:54:18 -04:00
Tim Abbott 846469c39c [schema]: Rename userprofile to user_profile. 
(imported from commit adfb6152b7ec32557e3465d961695eb870506d5a)
 2012-10-22 18:55:45 -04:00
Tim Abbott 93616039bc Use the new client data model to deduplicate mirroring. 
(imported from commit 6ac38534aea11b1e7f8f332e76251f9501f9ab3e)
 2012-10-22 18:31:36 -04:00
Tim Abbott f26a614bb3 Fix Client handling in the test suite. 
(imported from commit 56841a00052c3aa85f2eeb45133439a46f3caf82)
 2012-10-22 13:23:16 -04:00
Keegan McAllister ea916951f4 Disable notify_new_message calls in testing and populate_db 
(imported from commit 07a0fea4173e2e27a90ac5f111927f0000377764)
 2012-10-17 18:23:01 -04:00
Keegan McAllister 648755ebbd tests: Use the new initial passwords 
(imported from commit 1a84be999b12de62959d5f3a0261d7d946bbeb09)
 2012-10-17 18:23:01 -04:00
Tim Abbott a9d4dd4ffb Test new API key URLs. 
(imported from commit e4d41b73f905730cb8728862373265d2119cfa00)
 2012-10-17 17:12:44 -04:00
Tim Abbott 7237b4a73e Fix sending to a stream with a space in its name. 
Previously if you tried to send to "a b", we actually ended up trying
to send to "a%20b", since we were url-encoding the stream name and
then not properly decoding it.

(imported from commit 307d2999bd309e47fc654ae4422ab4372edde064)
 2012-10-17 14:06:00 -04:00
Tim Abbott b5c1178ac7 test_public_urls doesn't work with Tornado urls. 
(imported from commit fe56a80842ac7f34fc0af0f916ce26f94a4baca8)
 2012-10-16 17:25:00 -04:00
Tim Abbott a859c10017 Don't redirect to a login page when responding to json messages. 
Also update tests to actually check all our URLs.

(imported from commit 86de2027d140da6118e2f2f60c1c86511b16c141)
 2012-10-16 16:38:39 -04:00
Tim Abbott 3e994c16b7 Rename/reorganize our urls to be more consistent. 
(imported from commit ca3cc7ccd5d7da83a9c60968527378ee1118648e)
 2012-10-16 15:56:06 -04:00
Zev Benjamin f5131356f4 Fix test broken by 0917d5c2ed1b156603ce53aaec88ecbe26f5f39c 
(imported from commit 1efce3527c52722deb5ea5ece4aa2bca5e0665c5)
 2012-10-12 14:30:23 -04:00
Keegan McAllister 9811bd5f8a Get UserProfile by email with a join, not two queries 
(imported from commit 0698ebb88615cea54196181aeabe869ec466dbc1)
 2012-10-11 14:05:53 -04:00
Tim Abbott ac3f4393ff Rename instance to subject. 
(imported from commit 6b4693da03f106448c137cf81cf9801cac44f2b8)
 2012-10-10 18:01:39 -04:00
Tim Abbott 10d6106e36 Rename class => stream in tests.py local variables. 
(imported from commit 9fe439a71f49dc0d03d50844dc40d4db33050008)
 2012-10-10 17:48:17 -04:00
Tim Abbott 08e832e093 Change send_message to accept a stream, not a class. 
(imported from commit 0f58de2502bec227f5f33e44692d03f2f28d6f63)
 2012-10-10 17:48:17 -04:00
Tim Abbott 44e9e4cebf Rename Recipient.CLASS to Recipient.STREAM. 
(imported from commit a530194163f7260c73921137fa1ff671f14516f6)
 2012-10-10 17:47:13 -04:00
Tim Abbott 8daff2e05e Rename ZephyrClass to Stream. 
(imported from commit ae51b7a9e03f322dfe2dfccd250cbfc23adfe32e)
 2012-10-10 17:47:12 -04:00
Luke Faraone c3a9d60741 Partially fix a test that wasn't actually setting a variable. 
This still doesn't work for blocking reasons, but that's a TODO for later.

(imported from commit 8a1ebb5d0d964be95c9f458c254ef5767526bb24)
 2012-10-04 15:59:15 -04:00
Tim Abbott c83efefcc7 Replace 'zephyr' => 'message' in test suite. 
(imported from commit 550a4b1f3c45e3275181a04b3a892040ef508dc5)
 2012-10-04 14:37:36 -04:00
Tim Abbott e59d7cae48 Rename the Zephyr log to the Message log. 
(imported from commit 7dedfb76b6b78ea90a2bfd20788e251c9c29ef47)
 2012-10-03 18:14:15 -04:00
Tim Abbott 1ab81cff92 [schema] Rename Zephyr => Message in the schema. 
(imported from commit 4f402f150c45d2097d6b16943935e6e370b4f8d8)
 2012-10-03 18:14:15 -04:00
Tim Abbott 01bc4aaf28 Remove 'zephyr' from invalid message type error. 
(imported from commit 360ffc5bfbb12f65af83093ee5a83ac7caa5c464)
 2012-10-03 12:30:39 -04:00
Tim Abbott 7acfb5c71c Rename /zephyr/ to /send_message/. 
(imported from commit 41c2ff67cfc514e53aff8648c36f545526e324ed)
 2012-10-03 12:30:37 -04:00
Tim Abbott cca5f7b76a Rename do_send_zephyr to do_send_message. 
(imported from commit df4dc741bf00a197ca5ab39373bc9a3eda379684)
 2012-10-03 12:27:34 -04:00
Tim Abbott e79805847b Rename the 'new_zephyr' argument to the more descriptive 'content'. 
(imported from commit b47e2c4823bbfbf2f94cbafb24ed5d78dfbe841b)
 2012-10-02 17:29:55 -04:00
Luke Faraone 729d3ac602 Fix registration test, now exercise the email sending and verification code 
(imported from commit 62979bbfec107ba53a9209c0fe115ce08ffd0e58)
 2012-10-02 11:47:28 -04:00
Tim Abbott 029ae76a4a Fix some of our get_updates tests. 
(imported from commit 250411476c6fc71cff868b16a2ab766d81c4b6b3)
 2012-10-01 16:58:41 -04:00
Luke Faraone 9f80a2f6b3 /accounts/register now returns bad request; can only be POSTed. 
(imported from commit a7cf361c43fc41fdd47a58a92afa484c25c4417d)
 2012-10-01 16:03:00 -04:00
Keegan McAllister 20240d869c Rename get_updates_longpoll to get_updates 
(imported from commit 15635904584b324bdfa1414caea12c3bc4ce54c8)
 2012-09-27 15:46:36 -04:00
Tim Abbott 699e05383f Log messages and restore them with populate_db. 
(imported from commit 959f038a736e48d32819bc04bd054632a2e911c6)
 2012-09-27 15:01:30 -04:00
Tim Abbott 11e5e8785d Preparation for syncing messages back to MIT. 
(imported from commit 551b697366702de93579de259a9bc644be8d66ec)
 2012-09-24 14:31:40 -04:00
Waseem Daher f1aa17cf1d Change some URLs associated with subscriptions. 
Put all the 'API'-ish URLs in the /json/ namespace so that
/subscriptions and /subscriptions/add, etc. can be real
user-facing URLs if we want them to be.

(imported from commit 1455a32d27e44547ab1874b6289243cb40c85dde)
 2012-09-21 17:36:29 -04:00
Waseem Daher 5a164f19c2 Clean up subscription functions. 
Now that 'manage_subscriptions' only removes subscriptions,
let's name it that. Also, since both functions now only
act on one subscription at a time, use them in the singular.

(imported from commit 52cfc7b36eb1533da7aec1bc3a6e460151a56da8)
 2012-09-21 16:30:29 -04:00
Tim Abbott 135c82717d Authenticate by email. 
Approach from http://www.micahcarrick.com/django-email-authentication.html.

(imported from commit 796b8e08d8e1f9769cd3cf8ee61d3724ac3847b7)
 2012-09-21 10:34:48 -04:00
Tim Abbott ee8f28a084 Use email addresses as unique identifiers rather than usernames. 
Note that this code still assumes one's email address (stripped of
domain) is unique.

(imported from commit e98f96601ad109811978fc00b1165e97d8f7b185)
 2012-09-21 09:43:22 -04:00
Jessica McKellar f5c4bb7ab2 tests: Add new registration fields to registration tests. 
(imported from commit c666e0cf89aaed357bb5bea6f9fbaafc5efffa7c)
 2012-09-11 17:26:13 -04:00
Tim Abbott 37b1c1db11 Stop using foo.pk when we mean foo.id. 
(imported from commit b86359254415f65b32eeefdfbcb38d7bb862c1ac)
 2012-09-10 13:43:17 -04:00
Jessica McKellar e23dcd7646 Add tests for get_update_longpoll. 
(imported from commit 3dc1957647dd1ca5cb03f3d86cdf60bf318b7317)
 2012-09-10 10:17:43 -04:00
Tim Abbott ca132789bb [schema] Store Recipient types more efficiently. 
(imported from commit e0625ce9d2382682a5c8d53a5ac31a0399075df8)
 2012-09-10 10:03:50 -04:00
Keegan McAllister 80c6d09197 Remove unused imports 
(imported from commit 9f5c226708e44935e8d32c18ea7dd1ad2615d8d5)
 2012-09-07 13:57:32 -04:00
Tim Abbott d8ade6de5b Add create_zephyr_class helper. 
(imported from commit 993fbb799b706e402ae212330e4abbe28bf84ee9)
 2012-09-07 13:28:56 -04:00
Jessica McKellar e5d3c192c9 Update test_zephyr_to_nonexistent_class: classes are now created on the fly. 
(imported from commit 8d04d3aae650a72f01a18e8e0b7e80e093081be1)
 2012-09-06 16:06:26 -04:00
Jessica McKellar 13e5b45815 Return a JSON error on an invalid zephyr type. 
(imported from commit 2207464c368666715caf550f32136de45ea37142)
 2012-09-06 16:06:26 -04:00
Jessica McKellar fb8cab21ff tests: Add some basic /zephyr class and personal POST tests. 
(imported from commit 7e30ce1d24926f9ab46d9269603f1aae3da2b752)
 2012-09-06 15:46:48 -04:00
Jessica McKellar da730ab0b0 tests: Factor out POST result success and error checks. 
(imported from commit b818faf145ffeda6deb7d36fcce1313eade8f457)
 2012-09-06 15:46:47 -04:00
Jessica McKellar ebfb696ff7 Add tests for POSTs to /update. 
(imported from commit e936d0f2abe21da70ef653ce27c290c31dd091c6)
 2012-09-06 15:02:27 -04:00
Jessica McKellar df14dc0cf7 tests: Factor out retrieving user profiles from usernames. 
(imported from commit 004eabb8684952199b8a132eb29be3ce5daae724)
 2012-09-06 15:01:57 -04:00
Tim Abbott ef25dffb92 [schema] Add the realm to the ZepyhrClass objects. 
(imported from commit 8189ef27f2feef0c92f9c06a9243c085e36a66f5)
 2012-09-06 11:02:34 -04:00
Tim Abbott b761bf030b [schema] Fix names of fields in Subscription. 
(imported from commit 5f5c643286d348d16caac03419ba3011a8b81eff)
 2012-09-06 11:02:34 -04:00
Tim Abbott 38b30e5997 [schema] Add realms to the schema. 
Note that realms aren't actually used for anything, aren't prompted
for, etc, so this is mostly just a schema change and the refactoring
needed to allow setting the realm in the future.

(imported from commit b8b483dcc9601b288702284879e9c99707a50a5c)
 2012-09-06 11:02:34 -04:00
Tim Abbott 84ece4b3fe Combine the zephyr() and personal_zephyr() functions. 
(imported from commit a39b70f019901d0dd6994d4c440002111e4c29e1)
 2012-09-04 19:14:46 -04:00
Tim Abbott c059937f31 Remove fixtures from version control. 
(imported from commit 32f17aa1b674e47d730a00cced8b5bed8a136755)
 2012-09-04 16:34:39 -04:00
Tim Abbott 8f058937a0 Rename recipient.user_or_class to type.id. 
(imported from commit 74639cd08d0f53ae39624fc793f6fe55325b6d45)
 2012-09-04 16:34:39 -04:00
Jessica McKellar 8ade4a189a Add basic page access, class, and personal zephyr tests. 
(imported from commit 1054ceccb72b4708714cc3821456d73987923cbc)
 2012-09-04 10:48:39 -04:00
Jessica McKellar d90e8f6ec5 Initial Django commit: basic account, zephyr stream, narrowing, etc. 
(imported from commit 3cd40521171a4020c19021eda0d20ee9f802af41)
 2012-08-28 12:44:51 -04:00