Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

1 files changed, 5 insertions, 2 deletions

diff --git a/app/assets/javascripts/security_configuration/components/feature_card.vue b/app/assets/javascripts/security_configuration/components/feature_card.vue
index 7f0a049a6ad..395bdad5dcc 100644
--- a/app/assets/javascripts/security_configuration/components/feature_card.vue
+++ b/app/assets/javascripts/security_configuration/components/feature_card.vue
@@ -95,6 +95,9 @@ export default {
     showSecondaryConfigurationHelpPath() {
       return Boolean(this.available && this.feature.secondary?.configurationHelpPath);
     },
+    hyphenatedFeature() {
+      return this.feature.type.replace(/_/g, '-');
+    },
   },
   methods: {
     onError(message) {
@@ -167,7 +170,7 @@ export default {
         :href="feature.configurationPath"
         variant="confirm"
         :category="configurationButton.category"
-        :data-testid="`${feature.type}_enable_button`"
+        :data-testid="`${hyphenatedFeature}-enable-button`"
         class="gl-mt-5"
       >
         {{ configurationButton.text }}
@@ -179,7 +182,7 @@ export default {
         variant="confirm"
         :category="manageViaMrButtonCategory"
         class="gl-mt-5"
-        :data-testid="`${feature.type}_mr_button`"
+        :data-testid="`${hyphenatedFeature}-mr-button`"
         @error="onError"
       />