Merge branch 'repo-fixes-e' into 'master'

Repo fixes part E

See merge request !13472

3 files changed, 50 insertions, 30 deletions

diff --git a/spec/javascripts/repo/components/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js
index 0d216c9c026..edd27d3afb8 100644
--- a/spec/javascripts/repo/components/repo_sidebar_spec.js
+++ b/spec/javascripts/repo/components/repo_sidebar_spec.js
@@ -1,4 +1,6 @@
 import Vue from 'vue';
+import Helper from '~/repo/helpers/repo_helper';
+import RepoService from '~/repo/services/repo_service';
 import RepoStore from '~/repo/stores/repo_store';
 import repoSidebar from '~/repo/components/repo_sidebar.vue';
 
@@ -58,4 +60,51 @@ describe('RepoSidebar', () => {
 
     expect(vm.$el.querySelector('tbody .prev-directory')).toBeTruthy();
   });
+
+  describe('methods', () => {
+    describe('fileClicked', () => {
+      it('should fetch data for new file', () => {
+        spyOn(Helper, 'getContent').and.callThrough();
+        const file1 = {
+          id: 0,
+          url: '',
+        };
+        RepoStore.files = [file1];
+        RepoStore.isRoot = true;
+        const vm = createComponent();
+
+        vm.fileClicked(file1);
+
+        expect(Helper.getContent).toHaveBeenCalledWith(file1);
+      });
+
+      it('should hide files in directory if already open', () => {
+        spyOn(RepoStore, 'removeChildFilesOfTree').and.callThrough();
+        const file1 = {
+          id: 0,
+          type: 'tree',
+          url: '',
+          opened: true,
+        };
+        RepoStore.files = [file1];
+        RepoStore.isRoot = true;
+        const vm = createComponent();
+
+        vm.fileClicked(file1);
+
+        expect(RepoStore.removeChildFilesOfTree).toHaveBeenCalledWith(file1);
+      });
+    });
+
+    describe('goToPreviousDirectoryClicked', () => {
+      it('should hide files in directory if already open', () => {
+        const prevUrl = 'foo/bar';
+        const vm = createComponent();
+
+        vm.goToPreviousDirectoryClicked(prevUrl);
+
+        expect(RepoService.url).toEqual(prevUrl);
+      });
+    });
+  });
 });
diff --git a/spec/javascripts/repo/components/repo_tab_spec.js b/spec/javascripts/repo/components/repo_tab_spec.js
index f3572804b4a..a3b2d5dea82 100644
--- a/spec/javascripts/repo/components/repo_tab_spec.js
+++ b/spec/javascripts/repo/components/repo_tab_spec.js
@@ -12,7 +12,6 @@ describe('RepoTab', () => {
 
   it('renders a close link and a name link', () => {
     const tab = {
-      loading: false,
       url: 'url',
       name: 'name',
     };
@@ -26,7 +25,7 @@ describe('RepoTab', () => {
     spyOn(vm, 'tabClicked');
 
     expect(close.querySelector('.fa-times')).toBeTruthy();
-    expect(name.textContent).toEqual(tab.name);
+    expect(name.textContent.trim()).toEqual(tab.name);
 
     close.click();
     name.click();
@@ -35,25 +34,8 @@ describe('RepoTab', () => {
     expect(vm.tabClicked).toHaveBeenCalledWith(tab);
   });
 
-  it('renders a spinner if tab is loading', () => {
-    const tab = {
-      loading: true,
-      url: 'url',
-    };
-    const vm = createComponent({
-      tab,
-    });
-    const close = vm.$el.querySelector('.close');
-    const name = vm.$el.querySelector(`a[title="${tab.url}"]`);
-
-    expect(close).toBeFalsy();
-    expect(name).toBeFalsy();
-    expect(vm.$el.querySelector('.fa.fa-spinner.fa-spin')).toBeTruthy();
-  });
-
   it('renders an fa-circle icon if tab is changed', () => {
     const tab = {
-      loading: false,
       url: 'url',
       name: 'name',
       changed: true,
diff --git a/spec/javascripts/repo/components/repo_tabs_spec.js b/spec/javascripts/repo/components/repo_tabs_spec.js
index fdb12cfc00f..60459e90c48 100644
--- a/spec/javascripts/repo/components/repo_tabs_spec.js
+++ b/spec/javascripts/repo/components/repo_tabs_spec.js
@@ -18,13 +18,11 @@ describe('RepoTabs', () => {
 
   it('renders a list of tabs', () => {
     RepoStore.openedFiles = openedFiles;
-    RepoStore.tabsOverflow = true;
 
     const vm = createComponent();
     const tabs = [...vm.$el.querySelectorAll(':scope > li')];
 
     expect(vm.$el.id).toEqual('tabs');
-    expect(vm.$el.classList.contains('overflown')).toBeTruthy();
     expect(tabs.length).toEqual(3);
     expect(tabs[0].classList.contains('active')).toBeTruthy();
     expect(tabs[1].classList.contains('active')).toBeFalsy();
@@ -39,15 +37,6 @@ describe('RepoTabs', () => {
     expect(vm.$el.innerHTML).toBeFalsy();
   });
 
-  it('does not apply overflown class if not tabsOverflow', () => {
-    RepoStore.openedFiles = openedFiles;
-    RepoStore.tabsOverflow = false;
-
-    const vm = createComponent();
-
-    expect(vm.$el.classList.contains('overflown')).toBeFalsy();
-  });
-
   describe('methods', () => {
     describe('xClicked', () => {
       it('calls removeFromOpenedFiles with file obj', () => {