Use generated url paths universally

Author: PeterJCLaw

code_submitter/server.py

@@ -94,7 +94,7 @@ async def upload(request: Request) -> Response:
         )
 
     return RedirectResponse(
-        request.url_for('homepage'),
+        app.url_path_for('homepage'),
         # 302 so that the browser switches to GET
         status_code=302,
     )

templates/index.html

@@ -33,7 +33,7 @@ <h1>Virtual Competition Code Submission</h1>
       <div class="row">
         <form
           class="col-sm-6"
-          action="{{ url_for('upload') }}"
+          action="{{ request.app.url_path_for('upload') }}"
           enctype="multipart/form-data"
           method="POST"
         >

tests/tests_app.py

@@ -46,6 +46,7 @@ def setUp(self) -> None:
         test_client = TestClient(app)
         self.session = test_client.__enter__()
         self.session.auth = ('test_user', 'test_pass')
+        self.url_path_for = app.url_path_for
         self.database = database
         self.loop = asyncio.get_event_loop()
 
@@ -54,12 +55,12 @@ def tearDown(self) -> None:
         super().tearDown()
 
     def test_app(self) -> None:
-        response = self.session.get('/')
+        response = self.session.get(self.url_path_for('homepage'))
         self.assertEqual(200, response.status_code)
 
     def test_app_requires_auth(self) -> None:
         self.session.auth = None
-        response = self.session.get('/')
+        response = self.session.get(self.url_path_for('homepage'))
         self.assertEqual(401, response.status_code)
         self.assertIn('WWW-Authenticate', response.headers)
         self.assertIn(' realm=', response.headers['WWW-Authenticate'])
@@ -94,7 +95,7 @@ def test_shows_own_and_own_team_uploads(self) -> None:
             ),
         ))
 
-        response = self.session.get('/')
+        response = self.session.get(self.url_path_for('homepage'))
         self.assertEqual(200, response.status_code)
 
         html = response.text
@@ -156,7 +157,7 @@ def test_shows_chosen_archive(self) -> None:
             ),
         ))
 
-        response = self.session.get('/')
+        response = self.session.get(self.url_path_for('homepage'))
         self.assertEqual(200, response.status_code)
 
         html = response.text
@@ -182,11 +183,14 @@ def test_upload_file(self) -> None:
             zip_file.writestr('robot.py', 'print("I am a robot")')
 
         response = self.session.post(
-            '/upload',
+            self.url_path_for('upload'),
             files={'archive': ('whatever.zip', contents.getvalue(), 'application/zip')},
         )
         self.assertEqual(302, response.status_code)
-        self.assertEqual('http://testserver/', response.headers['location'])
+        self.assertEqual(
+            self.url_path_for('homepage'),
+            response.headers['location'],
+        )
 
         archives = self.await_(
             self.database.fetch_all(Archive.select()),
@@ -221,12 +225,15 @@ def test_upload_and_choose_file(self) -> None:
             zip_file.writestr('robot.py', 'print("I am a robot")')
 
         response = self.session.post(
-            '/upload',
+            self.url_path_for('upload'),
             data={'choose': 'on'},
             files={'archive': ('whatever.zip', contents.getvalue(), 'application/zip')},
         )
         self.assertEqual(302, response.status_code)
-        self.assertEqual('http://testserver/', response.headers['location'])
+        self.assertEqual(
+            self.url_path_for('homepage'),
+            response.headers['location'],
+        )
 
         archive, = self.await_(
             self.database.fetch_all(Archive.select()),
@@ -254,7 +261,7 @@ def test_upload_and_choose_file(self) -> None:
 
     def test_upload_bad_file(self) -> None:
         response = self.session.post(
-            '/upload',
+            self.url_path_for('upload'),
             files={'archive': ('whatever.zip', b'should-be-a-zip', 'application/zip')},
         )
         self.assertEqual(400, response.status_code)