From 098a98055abd32a7049b5429064f1ed45e45eea8 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 30 Oct 2017 16:25:32 +0000
Subject: spec fixes increased perf of scrolling tabs into view

---
 app/assets/javascripts/repo/components/new_dropdown/modal.vue | 4 ++--
 app/assets/javascripts/repo/components/repo.vue               | 8 +++++---
 app/assets/javascripts/repo/components/repo_preview.vue       | 2 +-
 app/assets/javascripts/repo/stores/actions.js                 | 7 ++-----
 app/assets/stylesheets/pages/repo.scss                        | 3 +++
 spec/features/projects/tree/create_file_spec.rb               | 2 +-
 spec/javascripts/repo/components/new_dropdown/index_spec.js   | 6 +++++-
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/repo/components/new_dropdown/modal.vue b/app/assets/javascripts/repo/components/new_dropdown/modal.vue
index e780b88b04c..ac1f613bb71 100644
--- a/app/assets/javascripts/repo/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/repo/components/new_dropdown/modal.vue
@@ -1,5 +1,5 @@
 <script>
-  import { mapActions, mapState } from 'vuex';
+  import { mapActions } from 'vuex';
   import { __ } from '../../../locale';
   import popupDialog from '../../../vue_shared/components/popup_dialog.vue';
 
@@ -28,7 +28,7 @@
       ]),
       createEntryInStore() {
         this.createTempEntry({
-          name: this.entryName.replace(new RegExp(`^${this.path}\/`), ''),
+          name: this.entryName.replace(new RegExp(`^${this.path}/`), ''),
           type: this.type,
         });
 
diff --git a/app/assets/javascripts/repo/components/repo.vue b/app/assets/javascripts/repo/components/repo.vue
index 1f0e168c777..98117802016 100644
--- a/app/assets/javascripts/repo/components/repo.vue
+++ b/app/assets/javascripts/repo/components/repo.vue
@@ -26,12 +26,14 @@ export default {
     RepoPreview,
   },
   mounted() {
-    const alertMessage = 'Are you sure you want to lose unsaved changes?';
+    const returnValue = 'Are you sure you want to lose unsaved changes?';
     window.onbeforeunload = (e) => {
       if (!this.changedFiles.length) return undefined;
 
-      e.returnValue = alertMessage;
-      return alertMessage;
+      Object.assign(e, {
+        returnValue,
+      });
+      return returnValue;
     };
   },
 };
diff --git a/app/assets/javascripts/repo/components/repo_preview.vue b/app/assets/javascripts/repo/components/repo_preview.vue
index b189a603c57..d4d0a667ce4 100644
--- a/app/assets/javascripts/repo/components/repo_preview.vue
+++ b/app/assets/javascripts/repo/components/repo_preview.vue
@@ -8,7 +8,7 @@ export default {
       'activeFile',
     ]),
     renderErrorTooLarge() {
-      return this.activeFile.renderError == 'too_large';
+      return this.activeFile.renderError === 'too_large';
     },
   },
   methods: {
diff --git a/app/assets/javascripts/repo/stores/actions.js b/app/assets/javascripts/repo/stores/actions.js
index 008de3d8315..856a3994b37 100644
--- a/app/assets/javascripts/repo/stores/actions.js
+++ b/app/assets/javascripts/repo/stores/actions.js
@@ -2,9 +2,6 @@ import Vue from 'vue';
 import flash from '../../flash';
 import service from '../services';
 import * as types from './mutation_types';
-import {
-  pushState,
-} from './utils';
 
 export const redirectToUrl = url => gl.utils.visitUrl(url);
 
@@ -118,9 +115,9 @@ export const scrollToTab = () => {
     const tabs = document.getElementById('tabs');
 
     if (tabs) {
-      const tabEl = tabs.querySelector('.active');
+      const tabEl = tabs.querySelector('.active .repo-tab');
 
-      tabs.scrollLeft = tabEl.offsetLeft;
+      tabEl.focus();
     }
   });
 };
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 019f3a2ec45..44831288541 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -41,7 +41,9 @@
   }
 
   .panel-right {
+    display: -webkit-flex;
     display: flex;
+    -webkit-flex-direction: column;
     flex-direction: column;
     width: 80%;
     height: 100%;
@@ -73,6 +75,7 @@
     }
 
     .blob-viewer-container {
+      -webkit-flex: 1;
       flex: 1;
       overflow: auto;
 
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
index f75122abad3..a67ec891e7c 100644
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -28,7 +28,7 @@ feature 'Multi-file editor new file', :js do
       click_button('Create file')
     end
 
-    find('.inputarea', visible: false).send_keys('file content')
+    find('.inputarea').send_keys('file content')
 
     fill_in('commit-message', with: 'commit message')
 
diff --git a/spec/javascripts/repo/components/new_dropdown/index_spec.js b/spec/javascripts/repo/components/new_dropdown/index_spec.js
index dd751f32333..93b10fc1fee 100644
--- a/spec/javascripts/repo/components/new_dropdown/index_spec.js
+++ b/spec/javascripts/repo/components/new_dropdown/index_spec.js
@@ -10,7 +10,11 @@ describe('new dropdown component', () => {
   beforeEach(() => {
     const component = Vue.extend(newDropdown);
 
-    vm = createComponentWithStore(component, store).$mount();
+    vm = createComponentWithStore(component, store);
+
+    vm.$store.state.path = '';
+
+    vm.$mount();
   });
 
   afterEach(() => {
-- 
cgit v1.2.1