expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-03 09:21:48 +01:00
Code Issues 18 Projects 3 Activity

still working on tests

Browse Source
This commit is contained in:
Philip Sargent 2023-11-22 18:58:19 +00:00
parent a63f04d194
commit 32e487eca6
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/TESTS/test_caves.py
View File

@ -158,7 +158,12 @@ class FixturePageTests(TestCase):
"""Expect to get Page Not Found and status 404""" """Expect to get Page Not Found and status 404"""
ph = self.ph ph = self.ph
ph = "Probably a mistake." ph = "Probably a mistake."
response = self.client.get("/1623/115") response = self.client.get("/1623/115/115")
# content = response.content.decode()
# with open('_test_bare_url115.html', 'w') as f:
# f.write(content)
self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND) self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
content = response.content.decode() content = response.content.decode()
@ -170,11 +175,11 @@ class FixturePageTests(TestCase):
ph = self.ph ph = self.ph
ph = "Probably a mistake." ph = "Probably a mistake."
response = self.client.get("/1623-115") response = self.client.get("/1623-115")
self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND) self.assertEqual(response.status_code, HTTPStatus.FOUND) # 302 redirected
content = response.content.decode() content = response.content.decode()
phmatch = re.search(ph, content) phmatch = re.search(ph, content)
self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph + "'") # 200 & Page Not Found self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph + "'") # 302 & Page Not Found
def test_fix_caves284(self): def test_fix_caves284(self):
response = self.client.get("/caves") response = self.client.get("/caves")

10
core/views/expo.py
View File

@ -133,7 +133,7 @@ def expowebpage(request, expowebpath, path):
if not os.path.isfile(expowebpath / path): if not os.path.isfile(expowebpath / path):
# Should not get here if the path has suffix "_edit" # Should not get here if the path has suffix "_edit"
print(f" - 404 error in expowebpage() {path}") print(f" - 404 error in expowebpage() {path}")
return render(request, "pagenotfound.html", {"path": path}, status="404") return render(request, "pagenotfound.html", {"path": path}, status=404)
# print(f' - {sys_getfilesystemencoding()=}') # print(f' - {sys_getfilesystemencoding()=}')
if sys_getfilesystemencoding() != "utf-8": if sys_getfilesystemencoding() != "utf-8":
@ -239,9 +239,9 @@ def mediapage(request, subpath=None, doc_root=None):
try: try:
return HttpResponse(content=open(filetobeopened, "rb"), content_type=getmimetype(subpath)) return HttpResponse(content=open(filetobeopened, "rb"), content_type=getmimetype(subpath))
except IOError: except IOError:
return render(request, "pagenotfound.html", {"path": subpath}, status="404") return render(request, "pagenotfound.html", {"path": subpath}, status=404)
else: else:
return render(request, "pagenotfound.html", {"path": subpath}, status="404") return render(request, "pagenotfound.html", {"path": subpath}, status=404)
def expopage(request, path): def expopage(request, path):
@ -270,7 +270,7 @@ def expopage(request, path):
if (expowebpath / path / p).is_file(): if (expowebpath / path / p).is_file():
# This needs to reset the path to the new subdirectory # This needs to reset the path to the new subdirectory
return HttpResponseRedirect("/" + str(Path(path) / p)) return HttpResponseRedirect("/" + str(Path(path) / p))
return render(request, "pagenotfound.html", {"path": Path(path) / "index.html"}, status="404") return render(request, "pagenotfound.html", {"path": Path(path) / "index.html"}, status=404)
if path.endswith("/"): if path.endswith("/"):
# we already know it is not a directory. # we already know it is not a directory.
@ -293,7 +293,7 @@ def expopage(request, path):
content_type = getmimetype(path) content_type = getmimetype(path)
return HttpResponse(content=content, content_type=content_type) return HttpResponse(content=content, content_type=content_type)
except IOError: except IOError:
return render(request, "pagenotfound.html", {"path": path}, status="404") return render(request, "pagenotfound.html", {"path": path}, status=404)
def getmimetype(path): def getmimetype(path):