Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 16 deletions

diff --git a/spec/frontend/vue_shared/components/file_finder/index_spec.js b/spec/frontend/vue_shared/components/file_finder/index_spec.js
index 921091c5b84..8f05108d460 100644
--- a/spec/frontend/vue_shared/components/file_finder/index_spec.js
+++ b/spec/frontend/vue_shared/components/file_finder/index_spec.js
@@ -105,18 +105,6 @@ describe('File finder item spec', () => {
       });
     });
 
-    describe('listHeight', () => {
-      it('returns 55 when entries exist', () => {
-        expect(vm.listHeight).toBe(55);
-      });
-
-      it('returns 33 when entries dont exist', () => {
-        vm.searchText = 'testing 123';
-
-        expect(vm.listHeight).toBe(33);
-      });
-    });
-
     describe('filteredBlobsLength', () => {
       it('returns length of filtered blobs', () => {
         vm.searchText = 'index';
@@ -253,11 +241,9 @@ describe('File finder item spec', () => {
 
   describe('without entries', () => {
     it('renders loading text when loading', () => {
-      createComponent({
-        loading: true,
-      });
+      createComponent({ loading: true });
 
-      expect(vm.$el.textContent).toContain('Loading...');
+      expect(vm.$el.querySelector('.gl-spinner')).not.toBe(null);
     });
 
     it('renders no files text', () => {