heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor MediaEntry fetches/checks into check_media().

Browse Source
This commit is contained in:
Brett Smith 2012-03-20 22:16:28 -04:00
parent 31dd6013b8
commit 77445d13ad
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mediagoblin/tests/test_submission.py
View File

@ -121,6 +121,14 @@ class TestSubmission:
assert template.TEMPLATE_TEST_CONTEXT.has_key( assert template.TEMPLATE_TEST_CONTEXT.has_key(
'mediagoblin/user_pages/user.html') 'mediagoblin/user_pages/user.html')
def check_media(self, request, find_data, count=None):
media = request.db.MediaEntry.find(find_data)
if count is not None:
assert_equal(media.count(), count)
if count == 0:
return
return media[0]
def test_tags(self): def test_tags(self):
# Good tag string # Good tag string
# -------- # --------
@ -128,7 +136,7 @@ class TestSubmission:
'tags': GOOD_TAG_STRING}, 'tags': GOOD_TAG_STRING},
*REQUEST_CONTEXT, do_follow=True, *REQUEST_CONTEXT, do_follow=True,
**self.upload_data(GOOD_JPG)) **self.upload_data(GOOD_JPG))
media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0] media = self.check_media(request, {'title': 'Balanced Goblin'}, 1)
assert_equal(media.tags, assert_equal(media.tags,
[{'name': u'yin', 'slug': u'yin'}, [{'name': u'yin', 'slug': u'yin'},
{'name': u'yang', 'slug': u'yang'}]) {'name': u'yang', 'slug': u'yang'}])
@ -147,10 +155,7 @@ class TestSubmission:
response, request = self.do_post({'title': 'Balanced Goblin'}, response, request = self.do_post({'title': 'Balanced Goblin'},
*REQUEST_CONTEXT, do_follow=True, *REQUEST_CONTEXT, do_follow=True,
**self.upload_data(GOOD_JPG)) **self.upload_data(GOOD_JPG))
media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0] media = self.check_media(request, {'title': 'Balanced Goblin'}, 1)
# Does media entry exist?
assert_true(media)
# Do not confirm deletion # Do not confirm deletion
# --------------------------------------------------- # ---------------------------------------------------
@ -159,19 +164,13 @@ class TestSubmission:
user=self.test_user.username, media=media._id) user=self.test_user.username, media=media._id)
# Empty data means don't confirm # Empty data means don't confirm
response = self.do_post({}, do_follow=True, url=delete_url)[0] response = self.do_post({}, do_follow=True, url=delete_url)[0]
media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0] media = self.check_media(request, {'title': 'Balanced Goblin'}, 1)
# Does media entry still exist?
assert_true(media)
# Confirm deletion # Confirm deletion
# --------------------------------------------------- # ---------------------------------------------------
response, request = self.do_post({'confirm': 'y'}, *REQUEST_CONTEXT, response, request = self.do_post({'confirm': 'y'}, *REQUEST_CONTEXT,
do_follow=True, url=delete_url) do_follow=True, url=delete_url)
# Does media entry still exist? self.check_media(request, {'_id': media._id}, 0)
assert_false(
request.db.MediaEntry.find(
{'_id': media._id}).count())
def test_malicious_uploads(self): def test_malicious_uploads(self):
# Test non-suppoerted file with non-supported extension # Test non-suppoerted file with non-supported extension