heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote branch 'origin/master' into bug261-resized-filenames

Browse Source 
This merge involved moving the new FilenameBuilder class to
processing/__init__.py, and putting the comment deletion tests back into
test_submission.py using the refactored functions.
This commit is contained in:
Brett Smith
2012-03-26 14:10:22 -04:00
parent 28f364bd6d 7ccf418185
commit c16b819663
84 changed files with 2758 additions and 2535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/tests/test_celery_setup.py
View File

@@ -48,7 +48,7 @@ def test_setup_celery_from_config():
assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float)
assert fake_celery_module.CELERY_RESULT_PERSISTENT is True
assert fake_celery_module.CELERY_IMPORTS == [
'foo.bar.baz', 'this.is.an.import', 'mediagoblin.processing']
'foo.bar.baz', 'this.is.an.import', 'mediagoblin.processing.task']
assert fake_celery_module.CELERY_RESULT_BACKEND == 'database'
assert fake_celery_module.CELERY_RESULT_DBURI == (
'sqlite:///' +

14
mediagoblin/tests/test_submission.py
View File

@@ -80,6 +80,10 @@ class TestSubmission:
def upload_data(self, filename):
return {'upload_files': [('file', filename)]}
def check_comments(self, request, media, count):
comments = request.db.MediaComment.find({'media_entry': media._id})
assert_equal(count, len(list(comments)))
def test_missing_fields(self):
# Test blank form
# ---------------
@@ -150,6 +154,15 @@ class TestSubmission:
**self.upload_data(GOOD_JPG))
media = self.check_media(request, {'title': 'Balanced Goblin'}, 1)
# Add a comment, so we can test for its deletion later.
self.check_comments(request, media, 0)
comment_url = request.urlgen(
'mediagoblin.user_pages.media_post_comment',
user=self.test_user.username, media=media._id)
response = self.do_post({'comment_content': 'i love this test'},
url=comment_url, do_follow=True)[0]
self.check_comments(request, media, 1)
# Do not confirm deletion
# ---------------------------------------------------
delete_url = request.urlgen(
@@ -164,6 +177,7 @@ class TestSubmission:
response, request = self.do_post({'confirm': 'y'}, *REQUEST_CONTEXT,
do_follow=True, url=delete_url)
self.check_media(request, {'_id': media._id}, 0)
self.check_comments(request, media, 0)
def test_evil_file(self):
# Test non-suppoerted file with non-supported extension