Add some releases to the Simple API functional test (#16556)

* Restructure functional test directory

* Add some releases to the Simple API functional test

* Update tests/functional/api/test_simple.py

Co-authored-by: Mike Fiedler <[email protected]>

* Use HTTPStatus everywhere instead of integers

---------

Co-authored-by: Mike Fiedler <[email protected]>

Author: di

tests/functional/legacy_api/__init__.py renamed to tests/functional/api/__init__.py

@@ -12,7 +12,7 @@
 
 from http import HTTPStatus
 
-from ...common.db.packaging import ProjectFactory
+from ...common.db.packaging import ProjectFactory, ReleaseFactory
 
 
 def test_simple_api_html(webtest):
@@ -24,6 +24,7 @@ def test_simple_api_html(webtest):
 
 def test_simple_api_detail(webtest):
     project = ProjectFactory.create()
+    ReleaseFactory.create_batch(2, project=project)
 
     resp = webtest.get(f"/simple/{project.normalized_name}/", status=HTTPStatus.OK)
 

tests/functional/legacy_api/test_simple.py renamed to tests/functional/api/test_simple.py

@@ -0,0 +1,11 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

tests/functional/forklift/__init__.py

@@ -10,6 +10,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from http import HTTPStatus
+
+import pytest
+
 
 def test_incorrect_post_redirect(webtest):
     """
@@ -19,11 +23,28 @@ def test_incorrect_post_redirect(webtest):
 
     See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/308
     """
-    resp = webtest.post("/legacy", status=308)
+    resp = webtest.post("/legacy", status=HTTPStatus.PERMANENT_REDIRECT)
     assert resp.status == (
         "308 An upload was attempted to /legacy but the expected upload URL is "
         "/legacy/ (with a trailing slash)"
     )
 
     assert "location" in resp.headers
     assert resp.headers["location"] == "http://localhost/legacy/"
+
+
+@pytest.mark.parametrize("action", ["submit", "submit_pkg_info"])
+def test_removed_upload_apis(webtest, action):
+    resp = webtest.post(f"/legacy/?:action={action}", status=HTTPStatus.GONE)
+    assert resp.status == (
+        "410 Project pre-registration is no longer required or supported, "
+        "upload your files instead."
+    )
+
+
+def test_remove_doc_upload(webtest):
+    resp = webtest.post("/legacy/?:action=doc_upload", status=HTTPStatus.GONE)
+    assert resp.status == (
+        "410 Uploading documentation is no longer supported, we recommend "
+        "using https://readthedocs.org/."
+    )

tests/functional/legacy_api/test_basic.py renamed to tests/functional/forklift/test_legacy.py

@@ -0,0 +1,11 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

tests/functional/legacy/__init__.py

@@ -0,0 +1,11 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

tests/functional/legacy/api/__init__.py

@@ -0,0 +1,20 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from http import HTTPStatus
+
+
+def test_doap(webtest):
+    resp = webtest.get(
+        "/pypi?:action=doap&name=foo&version=1.0", status=HTTPStatus.GONE
+    )
+    assert resp.status == "410 DOAP is no longer supported."

tests/functional/legacy/api/test_pypi.py

@@ -10,6 +10,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from http import HTTPStatus
+
 import pytest
 import webtest
 
@@ -21,7 +23,7 @@ def test_robots_txt(app_config, domain, indexable):
     app_config.add_settings({"warehouse.domain": domain, "enforce_https": False})
     testapp = webtest.TestApp(app_config.make_wsgi_app())
     resp = testapp.get("/robots.txt")
-    assert resp.status_code == 200
+    assert resp.status_code == HTTPStatus.OK
     assert resp.content_type == "text/plain"
     body = resp.body.decode(resp.charset)
     if indexable:
@@ -45,5 +47,5 @@ def test_robots_txt(app_config, domain, indexable):
 
 
 def test_non_existent_route_404(webtest):
-    resp = webtest.get("/asdadadasdasd/", status=404)
-    assert resp.status_code == 404
+    resp = webtest.get("/asdadadasdasd/", status=HTTPStatus.NOT_FOUND)
+    assert resp.status_code == HTTPStatus.NOT_FOUND

tests/functional/legacy_api/test_xmlrpc.py renamed to tests/functional/legacy/api/test_xmlrpc.py

@@ -10,6 +10,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from http import HTTPStatus
+
 from tests.common.db.accounts import UserFactory
 
 
@@ -27,4 +29,4 @@ def test_user_profile(webtest):
     assert user.username
     # ...and verify that the user's profile page exists
     resp = webtest.get(f"/user/{user.username}/")
-    assert resp.status_code == 200
+    assert resp.status_code == HTTPStatus.OK