Update affected specs

Updates the confirm danger jest tests and
the user changes project visibility rspec
tests

app/assets/javascripts/init_confirm_danger.js

@@ -2,6 +2,15 @@ import Vue from 'vue';
 import { parseBoolean } from './lib/utils/common_utils';
 import ConfirmDanger from './vue_shared/components/confirm_danger/confirm_danger.vue';
 
+const omitEmptyProperties = (fields) => {
+  return Object.entries(fields).reduce((acc, [key, value]) => {
+    if (value) {
+      return { ...acc, [key]: value };
+    }
+    return acc;
+  }, {});
+};
+
 export default () => {
   const el = document.querySelector('.js-confirm-danger');
   if (!el) return null;
@@ -12,7 +21,9 @@ export default () => {
     buttonText,
     buttonClass = '',
     buttonTestid = null,
+    buttonVariant = null,
     confirmDangerMessage,
+    confirmButtonText = null,
     disabled = false,
     additionalInformation,
     htmlConfirmationMessage,
@@ -20,17 +31,19 @@ export default () => {
 
   return new Vue({
     el,
-    provide: {
+    provide: omitEmptyProperties({
       htmlConfirmationMessage,
       confirmDangerMessage,
       additionalInformation,
-    },
+      confirmButtonText,
+    }),
     render: (createElement) =>
       createElement(ConfirmDanger, {
         props: {
           phrase,
           buttonText,
           buttonClass,
+          buttonVariant,
           buttonTestid,
           disabled: parseBoolean(disabled),
         },

app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger.vue

@@ -36,6 +36,11 @@ export default {
       required: false,
       default: 'confirm-danger-button',
     },
+    buttonVariant: {
+      type: String,
+      required: false,
+      default: 'danger',
+    },
   },
   modalId: CONFIRM_DANGER_MODAL_ID,
 };
@@ -45,7 +50,7 @@ export default {
     <gl-button
       v-gl-modal="$options.modalId"
       :class="buttonClass"
-      variant="danger"
+      :variant="buttonVariant"
       :disabled="disabled"
       :data-testid="buttonTestid"
       >{{ buttonText }}</gl-button

app/helpers/projects_helper.rb

@@ -677,8 +677,9 @@ module ProjectsHelper
       remove_form_id: remove_form_id,
       qa_selector: 'visibility_features_permissions_save_button',
       button_text: _('Save changes'),
-      confirm_button_text: _('Reduce project visibility'),
       button_testid: 'reduce-project-visibility-button',
+      button_variant: 'confirm',
+      confirm_button_text: _('Reduce project visibility'),
       confirm_danger_message: confirm_reduce_visibility_message(project),
       phrase: project.full_path,
       additional_information: _('Note: current forks will keep their visibility level.'),

spec/features/projects/user_changes_project_visibility_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe 'User changes public project visibility', :js do
 
       # binding.pry
 
-      find('.js-confirm-danger-input').send_keys(project.path_with_namespace)
+      fill_in 'confirm_name_input', with: project.path_with_namespace
 
       page.within '.modal' do
         click_button 'Reduce project visibility'