diff options
Diffstat (limited to 'mediagoblin/tests/test_submission.py')
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index b9b7388e..8d1b3745 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -81,8 +81,8 @@ 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}) + def check_comments(self, request, media_id, count): + comments = request.db.MediaComment.find({'media_entry': media_id}) assert_equal(count, len(list(comments))) def test_missing_fields(self): @@ -134,9 +134,11 @@ class TestSubmission: *REQUEST_CONTEXT, do_follow=True, **self.upload_data(GOOD_JPG)) 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'}]) + assert media.tags[0]['name'] == u'yin' + assert media.tags[0]['slug'] == u'yin' + + assert media.tags[1]['name'] == u'yang' + assert media.tags[1]['slug'] == u'yang' # Test tags that are too long # --------------- @@ -154,31 +156,33 @@ class TestSubmission: *REQUEST_CONTEXT, do_follow=True, **self.upload_data(GOOD_JPG)) media = self.check_media(request, {'title': 'Balanced Goblin'}, 1) + media_id = media.id # Add a comment, so we can test for its deletion later. - self.check_comments(request, media, 0) + self.check_comments(request, media_id, 0) comment_url = request.urlgen( 'mediagoblin.user_pages.media_post_comment', - user=self.test_user.username, media=media._id) + 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) + self.check_comments(request, media_id, 1) # Do not confirm deletion # --------------------------------------------------- delete_url = request.urlgen( 'mediagoblin.user_pages.media_confirm_delete', - user=self.test_user.username, media=media._id) + 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 = self.check_media(request, {'title': 'Balanced Goblin'}, 1) + media_id = media.id # Confirm deletion # --------------------------------------------------- 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) + self.check_media(request, {'_id': media_id}, 0) + self.check_comments(request, media_id, 0) def test_evil_file(self): # Test non-suppoerted file with non-supported extension @@ -246,7 +250,7 @@ class TestSubmission: filename = resource_filename( 'mediagoblin.tests', os.path.join('test_user_dev/media/public', - *media['media_files'].get(key, []))) + *media.media_files.get(key, []))) assert_true(filename.endswith('_' + basename)) # Is it smaller than the last processed image we looked at? size = os.stat(filename).st_size |