Merge branch...

Merge branch '202261-migrate-spinner-for-app/assets/javascripts/ajax_loading_spinner.js' into 'master'

Migrate '.fa-spinner' to '.spinner' for 'ajax_loading_spinner.js'

Closes #202261

See merge request gitlab-org/gitlab!41147

app/assets/javascripts/ajax_loading_spinner.js

@@ -28,7 +28,8 @@ export default class AjaxLoadingSpinner {
   static toggleLoadingIcon(iconElement) {
     const { classList } = iconElement;
     classList.toggle(iconElement.dataset.icon);
-    classList.toggle('fa-spinner');
-    classList.toggle('fa-spin');
+    classList.toggle('gl-spinner');
+    classList.toggle('gl-spinner-orange');
+    classList.toggle('gl-spinner-sm');
   }
 }

changelogs/unreleased/202261-migrate-spinner-for-app-assets-javascripts-ajax_loading_spinner-js.yml

+---
+title: Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/ajax_loading_spinner.js'
+merge_request: 41147
+author: Gilang Gumilar
+type: changed

spec/frontend/ajax_loading_spinner_spec.js

@@ -19,8 +19,9 @@ describe('Ajax Loading Spinner', () => {
       req.beforeSend(xhr, { dataType: 'text/html' });
 
       expect(icon).not.toHaveClass('fa-trash-o');
-      expect(icon).toHaveClass('fa-spinner');
-      expect(icon).toHaveClass('fa-spin');
+      expect(icon).toHaveClass('gl-spinner');
+      expect(icon).toHaveClass('gl-spinner-orange');
+      expect(icon).toHaveClass('gl-spinner-sm');
       expect(icon.dataset.icon).toEqual('fa-trash-o');
       expect(ajaxLoadingSpinner.getAttribute('disabled')).toEqual('');
 
@@ -44,8 +45,9 @@ describe('Ajax Loading Spinner', () => {
       const icon = ajaxLoadingSpinner.querySelector('i');
 
       expect(icon).toHaveClass('fa-trash-o');
-      expect(icon).not.toHaveClass('fa-spinner');
-      expect(icon).not.toHaveClass('fa-spin');
+      expect(icon).not.toHaveClass('gl-spinner');
+      expect(icon).not.toHaveClass('gl-spinner-orange');
+      expect(icon).not.toHaveClass('gl-spinner-sm');
       expect(ajaxLoadingSpinner.getAttribute('disabled')).toEqual(null);
 
       done();