Merge branch 'multi-download'

1 files changed, 1 insertions, 26 deletions

diff --git a/tests/integration/test_upload.py b/tests/integration/test_upload.py
index 651aedf..1903cbe 100644
--- a/tests/integration/test_upload.py
+++ b/tests/integration/test_upload.py
@@ -1,34 +1,9 @@
-import gzip
-from pathlib import Path
-
-import pytest
 from sqlalchemy import select, func
 from webtest import Upload
 
+from testutils import load_gpx_asset
 from fietsboek import models
 
-
-@pytest.fixture()
-def logged_in(dbsession, testapp, route_path):
-    user = models.User(email='foo@bar.com', is_verified=True)
-    user.set_password("foobar")
-    dbsession.add(user)
-
-    login = testapp.get(route_path('login'))
-    form = login.form
-    form['email'] = 'foo@bar.com'
-    form['password'] = 'foobar'
-    response = form.submit()
-    assert response.status_code == 302
-
-
-def load_gpx_asset(filename):
-    asset_dir = Path(__file__).parent.parent / 'assets'
-    test_file = asset_dir / filename
-    with gzip.open(test_file, 'rb') as fobj:
-        return fobj.read()
-
-
 def test_upload_forbidden(testapp, route_path):
     upload_form = testapp.get(route_path('upload'), status="4*")