diff --git a/composer.json b/composer.json index 08716fc..6edd764 100644 --- a/composer.json +++ b/composer.json @@ -5,20 +5,13 @@ "license": "GPL-2.0-or-later", "require": { "drupal/search_api": "^1.11", - "drupal/elasticsearch_connector": "^6.0-alpha2", - "dpc-sdp/tide_core": "^2.0.0" + "drupal/elasticsearch_connector": "^7.0", + "dpc-sdp/tide_core": "dev-feature/SDPA-5396-drupalcore-9 as 2.0.14" }, "repositories": { "drupal": { "type": "composer", "url": "https://packages.drupal.org/8" } - }, - "extra": { - "patches": { - "drupal/elasticsearch_connector": { - "deleteMapping() throws undefined error - https://www.drupal.org/project/elasticsearch_connector/issues/2824539": "https://www.drupal.org/files/issues/2021-07-20/%5BdeleteMapping-throws-undefined-error%5D-%5B3224368%5D-%5B1%5D_0.patch" - } - } } } diff --git a/dev-tools.sh b/dev-tools.sh index d7573df..2383d3a 100755 --- a/dev-tools.sh +++ b/dev-tools.sh @@ -34,5 +34,6 @@ # # Uncomment and set the Dev-Tools's commit value and commit this change. # export GH_COMMIT=COMMIT_SHA +export GH_COMMIT=a246dd0ddce06481c38f952f9286cda0b31a9d05 bash <(curl -L https://raw.githubusercontent.com/dpc-sdp/dev-tools/master/install?"$(date +%s)") "$@" diff --git a/tests/behat/features/search.feature b/tests/behat/features/search.feature index b7626a8..d1d8c60 100644 --- a/tests/behat/features/search.feature +++ b/tests/behat/features/search.feature @@ -40,7 +40,7 @@ Feature: Ensure Search API on Bay Elasticsearch work. And I save screenshot When I send a GET request to "http://elasticsearch:9200/elasticsearch_index_drupal_node/_search?q=title:testtitlepublished" - Then the rest response status code should be 200 + Then the response status code should be 200 And the response should be in JSON And the JSON node "hits" should exist And the JSON node "hits.hits" should exist @@ -61,7 +61,7 @@ Feature: Ensure Search API on Bay Elasticsearch work. # Unpublished Test content should not be in search results. When I send a GET request to "http://elasticsearch:9200/elasticsearch_index_drupal_node/_search?q=title:testtitlepublished" - Then the rest response status code should be 200 + Then the response status code should be 200 And the response should be in JSON And the JSON node "hits" should exist And the JSON node "hits.total" should be equal to "0"