fix tests and update deps

archivy/routes.py

@@ -3,7 +3,6 @@
 from pkg_resources import require
 from shutil import which
 from datetime import datetime
-import time
 
 import frontmatter
 from flask import (
@@ -55,7 +54,6 @@ def check_perms():
 @app.route("/")
 @app.route("/index")
 def index():
-    a = time.time()
     path = request.args.get("path", "").lstrip("/")
     try:
         files = data.get_items(path=path)
@@ -74,7 +72,6 @@ def index():
     except FileNotFoundError:
         flash("Directory does not exist.", "error")
         return redirect("/")
-    print(time.time() - a)
     return render_template(
         "home.html",
         title=path or "root",

requirements.txt

@@ -6,9 +6,9 @@
 # archivy/extensions.py: 6
 # archivy/models.py: 13
 # archivy/routes.py: 7
-Flask == 2.1.3
-werkzeug == 2.0.3
-jinja2 == 3.0.0
+Flask == 2.3.2
+werkzeug == 2.3.3
+jinja2 == 3.1.2
 
 # archivy/forms.py: 2
 Flask_WTF == 1.1.1
@@ -53,7 +53,7 @@ validators == 0.15.0
 # archivy/__init__.py: 9
 # archivy/models.py: 13
 # archivy/routes.py: 10
-flask-login == 0.5.0
+flask-login == 0.6.2
 
 click_plugins
 html2text

tests/functional/test_routes.py

@@ -1,13 +1,11 @@
 import os
-import re
 
 from flask.testing import FlaskClient
 from flask import request
 from flask_login import current_user
 from responses import RequestsMock, GET
-from werkzeug.security import generate_password_hash
 
-from archivy.helpers import get_max_id, get_db
+from archivy.helpers import get_max_id
 from archivy.data import get_dirs, create_dir, get_items, get_item
 
 
@@ -157,7 +155,7 @@ def test_logging_in(test_app, client: FlaskClient):
         follow_redirects=True,
     )
     assert resp.status_code == 200
-    assert request.path == "/"
+    assert resp.request.path == "/"
     assert current_user
 
 
@@ -168,7 +166,7 @@ def test_logging_in_with_invalid_creds(test_app, client: FlaskClient):
         follow_redirects=True,
     )
     assert resp.status_code == 200
-    assert request.path == "/login"
+    assert resp.request.path == "/login"
     assert b"Invalid credentials" in resp.data
 
 
@@ -183,7 +181,7 @@ def test_edit_user(test_app, client: FlaskClient):
         follow_redirects=True,
     )
 
-    assert request.path == "/"
+    assert resp.request.path == "/"
 
     client.delete("/logout")
 
@@ -193,7 +191,7 @@ def test_edit_user(test_app, client: FlaskClient):
         follow_redirects=True,
     )
     assert resp.status_code == 200
-    assert request.path == "/"
+    assert resp.request.path == "/"
     # check information has updated.
 
 
@@ -203,7 +201,7 @@ def test_logging_out(test_app, client: FlaskClient):
     client.delete("/logout")
 
     resp = client.get("/", follow_redirects=True)
-    assert request.path == "/login"
+    assert resp.request.path == "/login"
 
 
 def test_create_dir(test_app, client: FlaskClient):
@@ -216,7 +214,7 @@ def test_create_dir(test_app, client: FlaskClient):
     )
 
     assert resp.status_code == 200
-    assert request.args.get("path") == "testing"
+    assert resp.request.args.get("path") == "testing"
     assert "testing" in get_dirs()
     assert b"Folder successfully created" in resp.data
 
@@ -227,7 +225,7 @@ def test_creating_without_dirname_fails(test_app, client: FlaskClient):
     )
 
     assert resp.status_code == 200
-    assert request.path == "/"
+    assert resp.request.path == "/"
     assert b"Could not create folder." in resp.data
 
 
@@ -409,4 +407,4 @@ def test_bookmarklet_upload(test_app, client):
     )
     assert resp.status_code == 200
     assert title in str(resp.data)
-    assert "/dataobj/" in request.path
+    assert "/dataobj/" in resp.request.path