Merge branch 'main' into navset_docs_names

* main:
  Consolidate all testing into `tests/` folder (#683)

Author: schloerke

Makefile

@@ -77,11 +77,11 @@ check: ## check code quality with black and isort
 	isort --check-only --diff .
 
 test: ## run tests quickly with the default Python
-	python3 tests/asyncio_prevent.py
-	pytest tests
+	python3 tests/pytest/asyncio_prevent.py
+	pytest
 
 # Default `FILE` to `e2e` if not specified
-FILE:=e2e
+FILE:=tests/e2e
 
 e2e: ## end-to-end tests with playwright
 	playwright install --with-deps

pytest.ini

@@ -1,6 +1,6 @@
 [pytest]
 asyncio_mode=strict
-testpaths=tests
+testpaths=tests/pytest/
 addopts = --strict-markers --durations=6 --durations-min=5.0 --browser webkit --browser firefox --browser chromium --numprocesses auto
 markers =
     examples: Suite of tests to validate that examples do not produce errors (deselect with '-m "not examples"')

tests/__init__.py

@@ -1 +1 @@
-"""Unit test package for shiny."""
+"""Testing package for shiny. (Used by pytest)"""