Merge pull request #997 from GSA/update-requirement-map-search

update requirement for map search fix

ckan/requirements.in

@@ -2,7 +2,7 @@
 ckan==2.10.1
 git+https://github.com/ckan/ckanext-dcat@master#egg=ckanext-dcat
 -e git+https://github.com/ckan/ckanext-harvest.git@master#egg=ckanext-harvest
--e git+https://github.com/ckan/ckanext-spatial.git@v1.1.0#egg=ckanext-spatial
+-e git+https://github.com/ckan/ckanext-spatial.git@master#egg=ckanext-spatial
 git+https://github.com/GSA/ckanext-saml2auth.git@create_user_via_saml#egg=ckanext-saml2auth
 -e git+https://github.com/ckan/ckanext-qa.git@master#egg=ckanext-qa
 -e git+https://github.com/ckan/ckanext-archiver.git@master#egg=ckanext-archiver

ckan/requirements.txt

@@ -5,16 +5,16 @@ backports.zoneinfo==0.2.1
 Beaker==1.11.0
 bleach==3.3.0
 blinker==1.5
-boto3==1.28.7
-botocore==1.31.7
+boto3==1.28.8
+botocore==1.31.8
 certifi==2023.5.7
 cffi==1.15.1
 chardet==5.1.0
 charset-normalizer==3.2.0
 ckan==2.10.1
 -e git+https://github.com/ckan/ckanext-archiver.git@cbfadf9fbf10405958fdef9f77a7faedc05aa20b#egg=ckanext_archiver
 ckanext-datagovcatalog==0.1.0
-ckanext-datagovtheme==0.2.1
+ckanext-datagovtheme==0.2.2
 ckanext-datajson==0.1.20
 ckanext-dcat @ git+https://github.com/ckan/ckanext-dcat@eb1aee013687a40d0366a2fe44546917ee960bfc
 ckanext-envvars==0.0.3
@@ -25,7 +25,7 @@ ckanext-metrics-dashboard==0.1.6
 -e git+https://github.com/ckan/ckanext-qa.git@1731b59d2bf82b06f7866c204b26eb7c6c9ea1f9#egg=ckanext_qa
 -e git+https://github.com/ckan/ckanext-report.git@3588577f46d17e5f6ef163bb984d0e7016daef71#egg=ckanext_report
 ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@c2b12a94430034c522b25d282323a064e2d6a03a
--e git+https://github.com/ckan/ckanext-spatial.git@17d5a341cf8f40b35b25df91a18ce72c31195ba3#egg=ckanext_spatial
+-e git+https://github.com/ckan/ckanext-spatial.git@7091f4b7f2b6a04c3b7164a1e86f0924b2c12436#egg=ckanext_spatial
 ckantoolkit==0.0.7
 click==8.1.3
 cryptography==41.0.2

e2e/cypress/integration/ckan_extensions.cy.js

@@ -1,5 +1,5 @@
 describe('CKAN Extensions', () => {
-    it('Uses CKAN 2.9', () => {
+    it('Uses CKAN 2.10', () => {
         cy.request('/api/action/status_show').should((response) => {
             expect(response.body).to.have.property('success', true);
             expect(response.body.result).to.have.property('ckan_version', '2.10.1');

e2e/cypress/integration/spatial.cy.js

@@ -17,18 +17,18 @@ describe('Spatial', { testIsolation: false }, () => {
 
     it('The map view works and can draw box and search', () => {
         cy.visit('/dataset');
-        cy.get('.leaflet-draw-draw-rectangle').click();
-        cy.get('#dataset-map-edit-buttons').find('.disabled');
-        cy.get('#dataset-map-container')
+        cy.get('.leaflet-control-custom-button').click();
+        cy.get('.modal-spatial-query .modal-footer').find('.disabled');
+        cy.get('#draw-map-container')
             .trigger('mousedown', { which: 1 })
             .trigger('mousemove', { clientX: 500, clientY: 153 })
             .trigger('mouseup');
         cy.hide_debug_toolbar();
         // click the apply button then on the next redirected page find the box
         // on the map and content in the body
-        cy.get('#dataset-map-edit-buttons').find('[class="btn apply btn-primary"]').click();
+        cy.get('.modal-spatial-query .modal-footer').find('[class="btn btn-primary apply"]').click();
         cy.get('#dataset-map-container').find('svg.leaflet-zoom-animated');
-        cy.contains(/datasets? found/);
+        cy.contains(/2 datasets found/);
     });
 
     it('Can search in the location dropdown', () => {