diff options
| author | Joar Wandborg <git@wandborg.com> | 2012-06-10 15:53:46 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-06-10 15:53:46 +0200 |
| commit | 879ff4bde6afaee8bf5bdc2a0e659d66e767d424 (patch) | |
| tree | 71c9031f785f490f82d2fb7360b72b0f6007e2fe /mediagoblin/tests/test_edit.py | |
| parent | a855e92a985a9bdc9c5062cad268eba3d8e19f84 (diff) | |
| parent | fa72e516897a370b1e47e5f0ff17155990cd2414 (diff) | |
| download | mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.tar.lz mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.tar.xz mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.zip | |
Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into notifications-merge
Conflicts:
mediagoblin/db/mongo/migrations.py
Diffstat (limited to 'mediagoblin/tests/test_edit.py')
| -rw-r--r-- | mediagoblin/tests/test_edit.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py index 398a5d25..6c4020da 100644 --- a/mediagoblin/tests/test_edit.py +++ b/mediagoblin/tests/test_edit.py @@ -37,6 +37,7 @@ def test_change_password(test_app): '/edit/account/', { 'old_password': 'toast', 'new_password': '123456', + 'wants_comment_notification': 'y' }) # test_user has to be fetched again in order to have the current values |