ASCII media type support & fix a bug in file submission error handling

[mediagoblin.git] / mediagoblin / tests / test_submission.py

diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index a3453f2f012d2988981959ed63602106bb36a662..4a0543a86e7e4e30e243cb5a4c1f6507ef1c6da3 100644 (file)
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -1,3 +1,4 @@
+
 # GNU MediaGoblin -- federated, autonomous media hosting
 # Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
 #
@@ -16,6 +17,7 @@
 
 import urlparse
 import pkg_resources
+import re
 
 from nose.tools import assert_equal, assert_true, assert_false
 
@@ -170,8 +172,8 @@ class TestSubmission:
         response = self.test_app.post(
             request.urlgen('mediagoblin.user_pages.media_confirm_delete',
                            # No work: user=media.uploader().username,
-                           user=self.test_user['username'],
-                           media=media.slug),
+                           user=self.test_user.username,
+                           media=media._id),
             # no value means no confirm
             {})
 
@@ -190,8 +192,8 @@ class TestSubmission:
         response = self.test_app.post(
             request.urlgen('mediagoblin.user_pages.media_confirm_delete',
                            # No work: user=media.uploader().username,
-                           user=self.test_user['username'],
-                           media=media.slug),
+                           user=self.test_user.username,
+                           media=media._id),
             {'confirm': 'y'})
 
         response.follow()
@@ -216,7 +218,8 @@ class TestSubmission:
 
         context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/submit/start.html']
         form = context['submit_form']
-        assert form.file.errors == [u'Invalid file type.']
+        assert re.match(r'^Could not extract any file extension from ".*?"$', str(form.file.errors[0]))
+        assert len(form.file.errors) == 1
 
         # NOTE: The following 2 tests will ultimately fail, but they
         #   *will* pass the initial form submission step.  Instead,