Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/frontend/vue_shared/components/file_row_spec.js b/spec/frontend/vue_shared/components/file_row_spec.js
index 976866af27c..d063db1e34b 100644
--- a/spec/frontend/vue_shared/components/file_row_spec.js
+++ b/spec/frontend/vue_shared/components/file_row_spec.js
@@ -1,4 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
+import { GlIcon } from '@gitlab/ui';
 import { nextTick } from 'vue';
 import { file } from 'jest/ide/helpers';
 import { escapeFileUrl } from '~/lib/utils/url_utility';
@@ -153,4 +154,16 @@ describe('File row component', () => {
 
     expect(wrapper.findComponent(FileIcon).props('submodule')).toBe(submodule);
   });
+
+  it('renders pinned icon', () => {
+    createComponent({
+      file: {
+        ...file(),
+        pinned: true,
+      },
+      level: 0,
+    });
+
+    expect(wrapper.findComponent(GlIcon).props('name')).toBe('thumbtack');
+  });
 });