diff --git a/Dockerfile b/Dockerfile index f4213457..b6a48d49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG CKAN_VERSION USER root -RUN apt-get update && apt-get install -y postgresql-client openjdk-17-jre +RUN apt-get update && apt-get install -y postgresql-client openjdk-17-jre geos-dev # Download Saxon jar for FGDC2ISO transform (geodatagov) ARG saxon_ver=9.9.1-7 diff --git a/ckanext/geodatagov/tests/111test_fix_spatial.py b/ckanext/geodatagov/tests/test_fix_spatial.py similarity index 99% rename from ckanext/geodatagov/tests/111test_fix_spatial.py rename to ckanext/geodatagov/tests/test_fix_spatial.py index 41201555..41afd28b 100644 --- a/ckanext/geodatagov/tests/111test_fix_spatial.py +++ b/ckanext/geodatagov/tests/test_fix_spatial.py @@ -4,8 +4,9 @@ import ckan.tests.factories as factories import ckan.tests.helpers as helpers from ckan.model.meta import Session, metadata +import pytest - +@pytest.mark.usefixtures("with_plugins") class TestSpatialField(object): @classmethod @@ -27,7 +28,6 @@ def setup_class(cls): cls.user = factories.Sysadmin(name='spatial_user') def test_numeric_spatial_transformation(self): - old_geo = '10.0,0.0,15.0,5.0' context = {'user': self.user['name'], 'ignore_auth': True} @@ -54,7 +54,6 @@ def test_numeric_spatial_transformation(self): result = helpers.call_action( 'package_search', extras={'ext_bbox': '9,-1,16,4'}) - assert result['count'] == 1 assert result['results'][0]['id'] == dataset['id'] diff --git a/ckanext/geodatagov/tests/test_waf.py b/ckanext/geodatagov/tests/test_waf.py index 41e1d1ad..7be8e7ba 100644 --- a/ckanext/geodatagov/tests/test_waf.py +++ b/ckanext/geodatagov/tests/test_waf.py @@ -24,11 +24,6 @@ def setup_class(cls): log.info('Starting mock http server') mock_static_file_server.serve() - # @classmethod - # def setup(cls): - # reset_db() - # cls.organization = Organization() - def setup_method(self): # https://github.com/ckan/ckan/issues/4764 # drop extension postgis so we can reset db