simplify

abilian · Jul 9, 2018 · 75eade0 · 75eade0
1 parent 7237391
commit 75eade0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/abilian/services/vocabularies/tests.py b/abilian/services/vocabularies/tests.py
@@ -137,36 +137,33 @@ def test_admin_panel_reorder(app, db, session, client, test_request_context):
     data.update(base_data)
     r = client.post(url, data=data)
     assert r.status_code == 302
-    assert path_from_url(r.headers["Location"]) == "/admin/vocabularies"
+    assert path_from_url(r.location) == "/admin/vocabularies"
     assert Voc.query.order_by(Voc.position).all() == [second, first, third]
 
     data = {"up": first.id, "return_to": "group"}
     data.update(base_data)
     r = client.post(url, data=data)
     assert r.status_code == 302
-    assert path_from_url(r.headers["Location"]) == "/admin/vocabularies/_/"
+    assert path_from_url(r.location) == "/admin/vocabularies/_/"
     assert Voc.query.order_by(Voc.position).all() == [first, second, third]
 
     data = {"up": first.id, "return_to": "model"}
     data.update(base_data)
     r = client.post(url, data=data)
     assert r.status_code == 302
-    assert (
-        path_from_url(r.headers["Location"])
-        == "/admin/vocabularies/_/defaultstates/"
-    )
+    assert path_from_url(r.location) == "/admin/vocabularies/_/defaultstates/"
     assert Voc.query.order_by(Voc.position).all() == [first, second, third]
 
     data = {"down": third.id}
     data.update(base_data)
     r = client.post(url, data=data)
     assert r.status_code == 302
-    assert path_from_url(r.headers["Location"]) == "/admin/vocabularies"
+    assert path_from_url(r.location) == "/admin/vocabularies"
     assert Voc.query.order_by(Voc.position).all() == [first, second, third]
 
     data = {"up": third.id}
     data.update(base_data)
     r = client.post(url, data=data)
     assert r.status_code == 302
-    assert path_from_url(r.headers["Location"]) == "/admin/vocabularies"
+    assert path_from_url(r.location) == "/admin/vocabularies"
     assert Voc.query.order_by(Voc.position).all() == [first, third, second]
diff --git a/abilian/testing/util.py b/abilian/testing/util.py
@@ -17,6 +17,7 @@
     "cleanup_db",
     "client_login",
     "login",
+    "path_from_url",
 )
 
 

diff --git a/abilian/testing/validation.py b/abilian/testing/validation.py
@@ -12,7 +12,7 @@
 
 SKIPPED_PATHS = [
     # FIXME: later
-    ("admin", "settings"),
+    ("admin", "settings")
 ]