diff options
| author | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-20 22:16:28 -0400 |
|---|---|---|
| committer | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-20 22:16:28 -0400 |
| commit | 77445d13adbceab08681d77d736c5226a6cbf4db (patch) | |
| tree | d60fad2e7a1c0b378a0b9c0fafff8a3959dcd37b /mediagoblin/tests | |
| parent | 31dd6013b895cbd34b022b309eddb1c2d61503a9 (diff) | |
| download | mediagoblin-77445d13adbceab08681d77d736c5226a6cbf4db.tar.lz mediagoblin-77445d13adbceab08681d77d736c5226a6cbf4db.tar.xz mediagoblin-77445d13adbceab08681d77d736c5226a6cbf4db.zip | |
Refactor MediaEntry fetches/checks into check_media().
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 730efbd2..65c3bac7 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -121,6 +121,14 @@ class TestSubmission: assert template.TEMPLATE_TEST_CONTEXT.has_key( '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): # Good tag string # -------- @@ -128,10 +136,10 @@ class TestSubmission: 'tags': GOOD_TAG_STRING}, *REQUEST_CONTEXT, do_follow=True, **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, [{'name': u'yin', 'slug': u'yin'}, - {'name': u'yang', 'slug': u'yang'}]) + {'name': u'yang', 'slug': u'yang'}]) # Test tags that are too long # --------------- @@ -147,10 +155,7 @@ class TestSubmission: response, request = self.do_post({'title': 'Balanced Goblin'}, *REQUEST_CONTEXT, do_follow=True, **self.upload_data(GOOD_JPG)) - media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0] - - # Does media entry exist? - assert_true(media) + media = self.check_media(request, {'title': 'Balanced Goblin'}, 1) # Do not confirm deletion # --------------------------------------------------- @@ -159,19 +164,13 @@ class TestSubmission: user=self.test_user.username, media=media._id) # Empty data means don't confirm response = self.do_post({}, do_follow=True, url=delete_url)[0] - media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0] - - # Does media entry still exist? - assert_true(media) + media = self.check_media(request, {'title': 'Balanced Goblin'}, 1) # Confirm deletion # --------------------------------------------------- response, request = self.do_post({'confirm': 'y'}, *REQUEST_CONTEXT, do_follow=True, url=delete_url) - # Does media entry still exist? - assert_false( - request.db.MediaEntry.find( - {'_id': media._id}).count()) + self.check_media(request, {'_id': media._id}, 0) def test_malicious_uploads(self): # Test non-suppoerted file with non-supported extension |