1 files changed, 24 insertions, 3 deletions
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 3e78b2e3..18d4ec0c 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -25,7 +25,7 @@ from paste.deploy import loadapp
 from webtest import TestApp
 
 from mediagoblin import mg_globals
-from mediagoblin.db.models import User
+from mediagoblin.db.models import User, Collection
 from mediagoblin.tools import testing
 from mediagoblin.init.config import read_mediagoblin_config
 from mediagoblin.db.open import setup_connection_and_db_from_config
@@ -103,7 +103,7 @@ def suicide_if_bad_celery_environ():
         raise BadCeleryEnviron(BAD_CELERY_MESSAGE)
 
 
-def get_test_app(dump_old_app=True):
+def get_app(dump_old_app=True):
     suicide_if_bad_celery_environ()
 
     # Make sure we've turned on testing
@@ -164,7 +164,7 @@ def setup_fresh_app(func):
     """
     @wraps(func)
     def wrapper(*args, **kwargs):
-        test_app = get_test_app()
+        test_app = get_app()
         testing.clear_test_buckets()
         return func(test_app, *args, **kwargs)
 
@@ -226,3 +226,24 @@ def fixture_add_user(username=u'chris', password=u'toast',
     Session.expunge(test_user)
 
     return test_user
+
+
+def fixture_add_collection(name=u"My first Collection", user=None):
+    if user is None:
+        user = fixture_add_user()
+    coll = Collection.query.filter_by(creator=user.id, title=name).first()
+    if coll is not None:
+        return coll
+    coll = Collection()
+    coll.creator = user.id
+    coll.title = name
+    coll.generate_slug()
+    coll.save()
+
+    # Reload
+    Session.refresh(coll)
+
+    # ... and detach from session:
+    Session.expunge(coll)
+
+    return coll