diff options
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/config_spec.ini | 2 | ||||
| -rw-r--r-- | mediagoblin/tests/resources.py | 2 | ||||
| -rw-r--r-- | mediagoblin/tests/test_mgoblin_app.ini | 2 | ||||
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 16 |
4 files changed, 13 insertions, 9 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 535af4c1..1e4ee083 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -79,7 +79,7 @@ plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/") upload_limit = integer(default=None) # Max file size (in Mb) -max_file_size = integer(default=5000) +max_file_size = integer(default=None) [jinja2] # Jinja2 supports more directives than the minimum required by mediagoblin. diff --git a/mediagoblin/tests/resources.py b/mediagoblin/tests/resources.py index 4260df93..63789a2e 100644 --- a/mediagoblin/tests/resources.py +++ b/mediagoblin/tests/resources.py @@ -30,6 +30,8 @@ EVIL_PNG = resource('evil.png') BIG_BLUE = resource('bigblue.png') GOOD_PDF = resource('good.pdf') MED_PNG = resource('medium.png') +BIG_PNG = resource('big.png') +MED_PNG = resource('medium.png') def resource_exif(f): diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini index a2855d7a..4cd3d9b6 100644 --- a/mediagoblin/tests/test_mgoblin_app.ini +++ b/mediagoblin/tests/test_mgoblin_app.ini @@ -15,6 +15,8 @@ allow_attachments = True upload_limit = 500 +max_file_size = 2 + [storage:publicstore] base_dir = %(here)s/user_dev/media/public base_url = /mgoblin_media/ diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index f6ecd58a..7f4e8086 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -31,7 +31,7 @@ from mediagoblin.media_types.image import ImageMediaManager from mediagoblin.media_types.pdf.processing import check_prerequisites as pdf_check_prerequisites from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \ - BIG_BLUE, GOOD_PDF, GPS_JPG, MED_PNG + BIG_BLUE, GOOD_PDF, GPS_JPG, MED_PNG, BIG_PNG GOOD_TAG_STRING = u'yin,yang' BAD_TAG_STRING = unicode('rage,' + 'f' * 26 + 'u' * 26) @@ -177,7 +177,7 @@ class TestSubmission: # User uploaded should be 25 assert self.test_user.uploaded == 25 - response, context = self.do_post({'title': u'Normal upload 4'}, + response, context = self.do_post({'title': u'Normal upload 5'}, do_follow=True, **self.upload_data(GOOD_JPG)) self.check_url(response, '/u/{0}/'.format(self.test_user.username)) @@ -212,13 +212,13 @@ class TestSubmission: # Shouldn't have uploaded assert self.test_user.uploaded == 499 - # Reload user - self.test_user = User.query.filter_by( - username=self.test_user.username - ).first() + def test_big_file(self): + response, context = self.do_post({'title': u'Normal upload 7'}, + do_follow=False, + **self.upload_data(BIG_PNG)) - # Shouldn't have uploaded - assert self.test_user.uploaded == 499 + form = context['mediagoblin/submit/start.html']['submit_form'] + assert form.file.errors == [u'Sorry, the file size is too big.'] def check_media(self, request, find_data, count=None): media = MediaEntry.query.filter_by(**find_data) |