Skip to content

Commit dcead08

Browse files
committed
make sure tests works with 0.9.8
1 parent 1c8eb44 commit dcead08

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

tests/api/test_api.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import pytest
88
from fastapi import Request
99
from httpx import ASGITransport, AsyncClient
10-
from pypgstac.db import PgstacDB
11-
from pypgstac.load import Loader
1210
from pystac import Collection, Extent, Item, SpatialExtent, TemporalExtent
1311
from stac_fastapi.api.app import StacApi
1412
from stac_fastapi.api.models import create_get_request_model, create_post_request_model
@@ -797,16 +795,8 @@ async def get_collection(
797795
@pytest.mark.asyncio
798796
@pytest.mark.parametrize("validation", [True, False])
799797
@pytest.mark.parametrize("hydrate", [True, False])
800-
async def test_no_extension(
801-
hydrate, validation, load_test_data, database, pgstac
802-
) -> None:
798+
async def test_no_extension(hydrate, validation, load_test_data, database) -> None:
803799
"""test PgSTAC with no extension."""
804-
connection = f"postgresql://{database.user}:{quote_plus(database.password)}@{database.host}:{database.port}/{database.dbname}"
805-
with PgstacDB(dsn=connection) as db:
806-
loader = Loader(db=db)
807-
loader.load_collections(os.path.join(DATA_DIR, "test_collection.json"))
808-
loader.load_items(os.path.join(DATA_DIR, "test_item.json"))
809-
810800
settings = Settings(
811801
testing=True,
812802
use_api_hydrate=hydrate,
@@ -819,7 +809,9 @@ async def test_no_extension(
819809
pgport=database.port,
820810
pgdatabase=database.dbname,
821811
)
822-
extensions = []
812+
extensions = [
813+
TransactionExtension(client=TransactionsClient(), settings=settings),
814+
]
823815
post_request_model = create_post_request_model(extensions, base_model=PgstacSearch)
824816
api = StacApi(
825817
client=CoreCrudClient(pgstac_search_model=post_request_model),
@@ -835,6 +827,17 @@ async def test_no_extension(
835827
)
836828
try:
837829
async with AsyncClient(transport=ASGITransport(app=app)) as client:
830+
response = await client.post(
831+
"http://test/collections",
832+
json=load_test_data("test_collection.json"),
833+
)
834+
assert response.status_code == 201
835+
response = await client.post(
836+
"http://test/collections/test-collection/items",
837+
json=load_test_data("test_item.json"),
838+
)
839+
assert response.status_code == 201
840+
838841
landing = await client.get("http://test/")
839842
assert landing.status_code == 200, landing.text
840843
assert "Queryables" not in [

tests/conftest.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ def database(postgresql_proc):
7474

7575
@pytest.fixture(
7676
params=[
77-
"0.8.6",
77+
# "0.8.6",
7878
"0.9.8",
7979
],
8080
autouse=True,
8181
)
82-
async def pgstac(database):
82+
async def pgstac(request, database):
8383
connection = f"postgresql://{database.user}:{quote(database.password)}@{database.host}:{database.port}/{database.dbname}"
8484
yield
8585
conn = await asyncpg.connect(dsn=connection)
@@ -91,8 +91,9 @@ async def pgstac(database):
9191
await conn.close()
9292
with PgstacDB(dsn=connection) as db:
9393
migrator = Migrate(db)
94-
version = migrator.run_migration()
94+
version = migrator.run_migration(toversion=request.param)
9595

96+
assert version == request.param
9697
logger.info(f"PGStac Migrated to {version}")
9798

9899

0 commit comments

Comments
 (0)