diff --git a/.vortex/tests/bats/circleci.bats b/.vortex/tests/bats/circleci.bats index 5e0116d27..06a285035 100644 --- a/.vortex/tests/bats/circleci.bats +++ b/.vortex/tests/bats/circleci.bats @@ -28,8 +28,7 @@ load _helper.circleci.bash assert_contains "homepage.feature" "${artifact_path_runner_0}" assert_contains "login.feature" "${artifact_path_runner_0}" - # @see https://github.com/drevops/vortex/issues/1461 - # assert_contains "clamav.feature" "${artifact_path_runner_0}" + assert_contains "clamav.feature" "${artifact_path_runner_0}" assert_not_contains "search.feature" "${artifact_path_runner_0}" artifact_path_runner_1="$(echo "${artifacts_data}" | jq -r '.items | map(select(.node_index == 1).path) | join("\n")')" @@ -38,8 +37,7 @@ load _helper.circleci.bash assert_contains "homepage.feature" "${artifact_path_runner_1}" assert_contains "login.feature" "${artifact_path_runner_1}" - # @see https://github.com/drevops/vortex/issues/1461 - # assert_not_contains "clamav.feature" "${artifact_path_runner_1}" + assert_not_contains "clamav.feature" "${artifact_path_runner_1}" assert_contains "search.feature" "${artifact_path_runner_1}" done } @@ -68,8 +66,7 @@ load _helper.circleci.bash assert_contains "homepage.feature" "${tests_data}" assert_contains "login.feature" "${tests_data}" - # @see https://github.com/drevops/vortex/issues/1461 - # assert_contains "clamav.feature" "${tests_data}" + assert_contains "clamav.feature" "${tests_data}" assert_contains "search.feature" "${tests_data}" done } diff --git a/.vortex/tests/bats/provision.bats b/.vortex/tests/bats/provision.bats index b82430826..299fb3ea2 100644 --- a/.vortex/tests/bats/provision.bats +++ b/.vortex/tests/bats/provision.bats @@ -133,9 +133,8 @@ assert_provision_info() { "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy" "@drush -y pm:install redis" - # @see https://github.com/drevops/vortex/issues/1461 - # "@drush -y pm:install clamav" - # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" + "@drush -y pm:install clamav" + "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" "@drush -y pm:install search_api search_api_solr" "@drush -y pm:install ys_core ys_search" "@drush -y deploy:hook" @@ -254,9 +253,8 @@ assert_provision_info() { "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy" "@drush -y pm:install redis" - # @see https://github.com/drevops/vortex/issues/1461 - # "@drush -y pm:install clamav" - # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" + "@drush -y pm:install clamav" + "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" "@drush -y pm:install search_api search_api_solr" "@drush -y pm:install ys_core ys_search" "@drush -y deploy:hook" @@ -384,9 +382,8 @@ assert_provision_info() { "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy" "@drush -y pm:install redis" - # @see https://github.com/drevops/vortex/issues/1461 - # "@drush -y pm:install clamav" - # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" + "@drush -y pm:install clamav" + "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" "@drush -y pm:install search_api search_api_solr" "@drush -y pm:install ys_core ys_search" "@drush -y deploy:hook" @@ -518,9 +515,8 @@ assert_provision_info() { "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy" "@drush -y pm:install redis" - # @see https://github.com/drevops/vortex/issues/1461 - # "@drush -y pm:install clamav" - # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" + "@drush -y pm:install clamav" + "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" "@drush -y pm:install search_api search_api_solr" "@drush -y pm:install ys_core ys_search" "@drush -y deploy:hook" @@ -648,9 +644,8 @@ assert_provision_info() { "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy" "@drush -y pm:install redis" - # @see https://github.com/drevops/vortex/issues/1461 - # "@drush -y pm:install clamav" - # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" + "@drush -y pm:install clamav" + "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" "@drush -y pm:install search_api search_api_solr" "@drush -y pm:install ys_core ys_search" "@drush -y deploy:hook" @@ -772,9 +767,8 @@ assert_provision_info() { "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy" "@drush -y pm:install redis" - # @see https://github.com/drevops/vortex/issues/1461 - # "@drush -y pm:install clamav" - # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" + "@drush -y pm:install clamav" + "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" "@drush -y pm:install search_api search_api_solr" "@drush -y pm:install ys_core ys_search" "@drush -y deploy:hook" @@ -903,9 +897,8 @@ assert_provision_info() { "@drush -y php:eval \Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" "@drush -y pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy" "@drush -y pm:install redis" - # @see https://github.com/drevops/vortex/issues/1461 - # "@drush -y pm:install clamav" - # "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" + "@drush -y pm:install clamav" + "@drush -y config-set clamav.settings mode_daemon_tcpip.hostname clamav" "@drush -y pm:install search_api search_api_solr" "@drush -y pm:install ys_core ys_search" "@drush -y deploy:hook" diff --git a/composer.json b/composer.json index d7d4978c3..289fc7e38 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "composer/installers": "^2.3", "cweagans/composer-patches": "^1.7", "drupal/admin_toolbar": "^3.5", + "drupal/clamav": "^2.1", "drupal/coffee": "^2", "drupal/config_split": "^2", "drupal/config_update": "^2@alpha", diff --git a/scripts/custom/provision-10-example.sh b/scripts/custom/provision-10-example.sh index 8b6026760..53d4769e6 100644 --- a/scripts/custom/provision-10-example.sh +++ b/scripts/custom/provision-10-example.sh @@ -38,9 +38,8 @@ if echo "${VORTEX_PROVISION_ENVIRONMENT:-}" | grep -q -e dev -e test -e ci -e lo #;> REDIS #;< CLAMAV - # @see https://github.com/drevops/vortex/issues/1461 - # drush pm:install clamav - # drush config-set clamav.settings mode_daemon_tcpip.hostname clamav + drush pm:install clamav + drush config-set clamav.settings mode_daemon_tcpip.hostname clamav #;> CLAMAV #;< SOLR diff --git a/tests/behat/features/clamav.feature b/tests/behat/features/clamav.feature index e33e4efce..e352e0d9e 100644 --- a/tests/behat/features/clamav.feature +++ b/tests/behat/features/clamav.feature @@ -1,4 +1,4 @@ -@clamav @p0 @skipped +@clamav @p0 Feature: ClamAV Anti-virus Ensure that ClamAV is working correctly. diff --git a/tests/phpunit/Drupal/SwitchableSettingsTest.php b/tests/phpunit/Drupal/SwitchableSettingsTest.php index dea27671b..75802a7b5 100644 --- a/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -19,9 +19,6 @@ class SwitchableSettingsTest extends SettingsTestCase { /** * Test ClamAV configs in Daemon mode with defaults. - * - * @group skipped - * @see https://github.com/drevops/vortex/issues/1461 */ public function testClamavDaemonCustom(): void { $this->setEnvVars([ @@ -42,9 +39,6 @@ public function testClamavDaemonCustom(): void { /** * Test ClamAV configs in Executable mode. - * - * @group skipped - * @see https://github.com/drevops/vortex/issues/1461 */ public function testClamavExecutable(): void { $this->setEnvVars([ @@ -63,9 +57,6 @@ public function testClamavExecutable(): void { /** * Test ClamAV configs in Daemon mode with defaults. - * - * @group skipped - * @see https://github.com/drevops/vortex/issues/1461 */ public function testClamavDaemonDefaults(): void { $this->setEnvVars([