aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/tools.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2013-01-18 11:42:56 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2013-01-18 11:42:56 +0100
commitcd75b2280fc2fe953bf1158ec1b9d5fb0d43a881 (patch)
tree1035787839344665135fee320bc62858a0ec8c6d /mediagoblin/tests/tools.py
parent1be247b36e58c8c71a974b65dff7194f28483f12 (diff)
downloadmediagoblin-cd75b2280fc2fe953bf1158ec1b9d5fb0d43a881.tar.lz
mediagoblin-cd75b2280fc2fe953bf1158ec1b9d5fb0d43a881.tar.xz
mediagoblin-cd75b2280fc2fe953bf1158ec1b9d5fb0d43a881.zip
Add some simple collection test.
Diffstat (limited to 'mediagoblin/tests/tools.py')
-rw-r--r--mediagoblin/tests/tools.py23
1 files changed, 22 insertions, 1 deletions
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 30218ede..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
@@ -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