Merge branch 'Resolve-Migrate-.fa-spinner-app/helpers' into 'master'

Resolve Migrate '.fa-spinner' to '.spinner' for 'app/helpers'

See merge request gitlab-org/gitlab!25033

app/helpers/dropdowns_helper.rb

@@ -129,8 +129,7 @@ module DropdownsHelper
   end
 
   def dropdown_loading
-    content_tag :div, class: "dropdown-loading" do
-      icon('spinner spin')
-    end
+    spinner = loading_icon(container: true, size: "md", css_class: "gl-mt-7")
+    content_tag(:div, spinner, class: "dropdown-loading")
   end
 end

app/helpers/icons_helper.rb

@@ -89,15 +89,6 @@ module IconsHelper
     sprite_icon(name, css_class: css_class)
   end
 
-  def spinner(text = nil, visible = false)
-    css_class = ['loading']
-    css_class << 'hide' unless visible
-
-    content_tag :div, class: css_class.join(' ') do
-      icon('spinner spin') + text
-    end
-  end
-
   def boolean_to_icon(value)
     if value
       sprite_icon('check', css_class: 'cgreen')

app/helpers/services_helper.rb

@@ -35,13 +35,6 @@ module ServicesHelper
     "#{event}_events"
   end
 
-  def service_save_button(disabled: false)
-    button_tag(class: 'btn btn-success', type: 'submit', disabled: disabled, data: { qa_selector: 'save_changes_button' }) do
-      icon('spinner spin', class: 'hidden js-btn-spinner') +
-        content_tag(:span, 'Save changes', class: 'js-btn-label')
-    end
-  end
-
   def scoped_integrations_path
     if @project.present?
       project_settings_integrations_path(@project)

app/views/projects/commits/show.html.haml

@@ -34,4 +34,5 @@
   %div{ id: dom_id(@project) }
     %ol#commits-list.list-unstyled.content_list
       = render 'commits', project: @project, ref: @ref
-  = spinner
+  .loading.hide
+    = loading_icon(size: "lg")

changelogs/unreleased/Resolve-Migrate--fa-spinner-app-helpers.yml

+---
+title: Migrate .fa-spinner to .spinner for app/helpers
+merge_request: 25033
+author: nuwe1
+type: other

spec/helpers/dropdowns_helper_spec.rb

@@ -246,8 +246,8 @@ RSpec.describe DropdownsHelper do
       expect(content).to include('dropdown-loading')
     end
 
-    it 'returns an icon in the content' do
-      expect(content.scan('icon').count).to eq(1)
+    it 'returns a gl-spinner in the content' do
+      expect(content).to include('gl-spinner')
     end
   end
 end