Merge branch 'migrate-folder-o-icon-jmiocene' into 'master'

Migrate folder-o icon to folder

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159717



Merged-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Co-authored-by: Julia Miocene <jmiocene@gitlab.com>

app/assets/javascripts/environments/components/environment_folder.vue

@@ -60,7 +60,7 @@ export default {
     icons() {
       return this.visible
         ? { caret: 'chevron-lg-down', folder: 'folder-open' }
-        : { caret: 'chevron-lg-right', folder: 'folder-o' };
+        : { caret: 'chevron-lg-right', folder: 'folder' };
     },
     label() {
       return this.visible ? this.$options.i18n.collapse : this.$options.i18n.expand;

app/assets/javascripts/jira_connect/subscriptions/components/group_item_name.vue

@@ -19,7 +19,7 @@ export default {
 
 <template>
   <div class="gl-display-flex gl-align-items-center">
-    <gl-icon name="folder-o" class="gl-mr-3" />
+    <gl-icon name="folder" class="gl-mr-3" />
     <div class="gl-display-none gl-flex-shrink-0 gl-sm-display-flex gl-mr-3">
       <gl-avatar
         :size="32"

app/helpers/icons_helper.rb

@@ -126,7 +126,7 @@ def visibility_level_icon(level, options: {})
 
   def file_type_icon_class(type, mode, name)
     if type == 'folder'
-      'folder-o'
+      'folder'
     elsif type == 'archive'
       'archive'
     elsif mode == '120000'

ee/app/assets/javascripts/approvals/components/hidden_groups_item.vue

@@ -14,7 +14,7 @@ export default {
 <template>
   <div class="gl-display-flex gl-align-items-center">
     <div class="square s24 gl-align-items-center gl-justify-content-center gl-mr-3 text-tertiary">
-      <gl-icon name="folder-o" :size="16" data-testid="folder-icon" />
+      <gl-icon name="folder" :size="16" data-testid="folder-icon" />
     </div>
     <span>{{ __('Private group(s)') }}</span>
     <gl-icon

ee/spec/frontend/approvals/components/hidden_groups_item_spec.js

@@ -38,7 +38,7 @@ describe('Approvals HiddenGroupsItem', () => {
     const folderIcon = findFolderIcon();
 
     expect(folderIcon.is(GlIcon)).toBe(true);
-    expect(folderIcon.props('name')).toBe('folder-o');
+    expect(folderIcon.props('name')).toBe('folder');
   });
 
   it('shows a help-icon with a tooltip', () => {

spec/frontend/environments/environment_folder_spec.js

@@ -89,7 +89,7 @@ describe('~/environments/components/environments_folder.vue', () => {
       it('is collapsed by default', () => {
         expect(collapse.props('visible')).toBe(false);
         const iconNames = icons.wrappers.map((i) => i.props('name')).slice(0, 2);
-        expect(iconNames).toEqual(['chevron-lg-right', 'folder-o']);
+        expect(iconNames).toEqual(['chevron-lg-right', 'folder']);
         expect(folderName.classes('gl-font-bold')).toBe(false);
       });
 

spec/frontend/jira_connect/subscriptions/components/__snapshots__/group_item_name_spec.js.snap

@@ -6,7 +6,7 @@ exports[`GroupItemName template matches the snapshot 1`] = `
 >
   <gl-icon-stub
     class="gl-mr-3"
-    name="folder-o"
+    name="folder"
     size="16"
     variant="current"
   />

spec/helpers/icons_helper_spec.rb

@@ -123,8 +123,8 @@
   end
 
   describe 'file_type_icon_class' do
-    it 'returns folder-o class' do
-      expect(file_type_icon_class('folder', 0, 'folder_name')).to eq 'folder-o'
+    it 'returns folder class' do
+      expect(file_type_icon_class('folder', 0, 'folder_name')).to eq 'folder'
     end
 
     it 'returns share class' do