Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2

# Conflicts:
#	db/schema.rb

14 files changed, 294 insertions, 80 deletions

diff --git a/spec/javascripts/blob/notebook/index_spec.js b/spec/javascripts/blob/notebook/index_spec.js
index 11f2a950678..c3e67550f05 100644
--- a/spec/javascripts/blob/notebook/index_spec.js
+++ b/spec/javascripts/blob/notebook/index_spec.js
@@ -117,7 +117,7 @@ describe('iPython notebook renderer', () => {
     it('shows error message', () => {
       expect(
         document.querySelector('.md').textContent.trim(),
-      ).toBe('An error occured whilst parsing the file.');
+      ).toBe('An error occurred whilst parsing the file.');
     });
   });
 
@@ -153,7 +153,7 @@ describe('iPython notebook renderer', () => {
     it('shows error message', () => {
       expect(
         document.querySelector('.md').textContent.trim(),
-      ).toBe('An error occured whilst loading the file. Please try again later.');
+      ).toBe('An error occurred whilst loading the file. Please try again later.');
     });
   });
 });
diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js
index bbeaf95e68d..51bf3086627 100644
--- a/spec/javascripts/blob/pdf/index_spec.js
+++ b/spec/javascripts/blob/pdf/index_spec.js
@@ -76,7 +76,7 @@ describe('PDF renderer', () => {
     it('shows error message', () => {
       expect(
         document.querySelector('.md').textContent.trim(),
-      ).toBe('An error occured whilst loading the file. Please try again later.');
+      ).toBe('An error occurred whilst loading the file. Please try again later.');
     });
   });
 });
diff --git a/spec/javascripts/build_spec.js b/spec/javascripts/build_spec.js
index 35149611095..d5b0f23e7b7 100644
--- a/spec/javascripts/build_spec.js
+++ b/spec/javascripts/build_spec.js
@@ -289,4 +289,18 @@ describe('Build', () => {
       });
     });
   });
+
+  describe('getBuildTrace', () => {
+    it('should request build trace with state parameter', (done) => {
+      spyOn(jQuery, 'ajax').and.callThrough();
+      new Build();
+
+      setTimeout(() => {
+        expect(jQuery.ajax).toHaveBeenCalledWith(
+          { url: `${BUILD_URL}/trace.json`, data: { state: '' } },
+        );
+        done();
+      }, 0);
+    });
+  });
 });
diff --git a/spec/javascripts/cycle_analytics/limit_warning_component_spec.js b/spec/javascripts/cycle_analytics/limit_warning_component_spec.js
index 2fb9eb0ca85..13e9fe00a00 100644
--- a/spec/javascripts/cycle_analytics/limit_warning_component_spec.js
+++ b/spec/javascripts/cycle_analytics/limit_warning_component_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import Translate from '~/vue_shared/translate';
-import limitWarningComp from '~/cycle_analytics/components/limit_warning_component';
+import limitWarningComp from '~/cycle_analytics/components/limit_warning_component.vue';
 
 Vue.use(Translate);
 
diff --git a/spec/javascripts/issuable_context_spec.js b/spec/javascripts/issuable_context_spec.js
new file mode 100644
index 00000000000..bcb2b7b24a0
--- /dev/null
+++ b/spec/javascripts/issuable_context_spec.js
@@ -0,0 +1,34 @@
+/* global IssuableContext */
+import '~/issuable_context';
+import $ from 'jquery';
+
+describe('IssuableContext', () => {
+  describe('toggleHiddenParticipants', () => {
+    const event = jasmine.createSpyObj('event', ['preventDefault']);
+
+    beforeEach(() => {
+      spyOn($.fn, 'data').and.returnValue('data');
+      spyOn($.fn, 'text').and.returnValue('data');
+    });
+
+    afterEach(() => {
+      gl.lazyLoader = undefined;
+    });
+
+    it('calls loadCheck if lazyLoader is set', () => {
+      gl.lazyLoader = jasmine.createSpyObj('lazyLoader', ['loadCheck']);
+
+      IssuableContext.prototype.toggleHiddenParticipants(event);
+
+      expect(gl.lazyLoader.loadCheck).toHaveBeenCalled();
+    });
+
+    it('does not throw if lazyLoader is not defined', () => {
+      gl.lazyLoader = undefined;
+
+      const toggle = IssuableContext.prototype.toggleHiddenParticipants.bind(null, event);
+
+      expect(toggle).not.toThrow();
+    });
+  });
+});
diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index 787b405de47..f86f2f260c3 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -84,6 +84,62 @@ describe('common_utils', () => {
       expectGetElementIdToHaveBeenCalledWith('definição');
       expectGetElementIdToHaveBeenCalledWith('user-content-definição');
     });
+
+    it('scrolls element into view', () => {
+      document.body.innerHTML += `
+        <div id="parent">
+          <div style="height: 2000px;"></div>
+          <div id="test" style="height: 2000px;"></div>
+        </div>
+      `;
+
+      window.history.pushState({}, null, '#test');
+      commonUtils.handleLocationHash();
+
+      expectGetElementIdToHaveBeenCalledWith('test');
+      expect(window.scrollY).toBe(document.getElementById('test').offsetTop);
+
+      document.getElementById('parent').remove();
+    });
+
+    it('scrolls user content element into view', () => {
+      document.body.innerHTML += `
+        <div id="parent">
+          <div style="height: 2000px;"></div>
+          <div id="user-content-test" style="height: 2000px;"></div>
+        </div>
+      `;
+
+      window.history.pushState({}, null, '#test');
+      commonUtils.handleLocationHash();
+
+      expectGetElementIdToHaveBeenCalledWith('test');
+      expectGetElementIdToHaveBeenCalledWith('user-content-test');
+      expect(window.scrollY).toBe(document.getElementById('user-content-test').offsetTop);
+
+      document.getElementById('parent').remove();
+    });
+
+    it('scrolls to element with offset from navbar', () => {
+      spyOn(window, 'scrollBy').and.callThrough();
+      document.body.innerHTML += `
+        <div id="parent">
+          <div class="navbar-gitlab" style="position: fixed; top: 0; height: 50px;"></div>
+          <div style="height: 2000px; margin-top: 50px;"></div>
+          <div id="user-content-test" style="height: 2000px;"></div>
+        </div>
+      `;
+
+      window.history.pushState({}, null, '#test');
+      commonUtils.handleLocationHash();
+
+      expectGetElementIdToHaveBeenCalledWith('test');
+      expectGetElementIdToHaveBeenCalledWith('user-content-test');
+      expect(window.scrollY).toBe(document.getElementById('user-content-test').offsetTop - 50);
+      expect(window.scrollBy).toHaveBeenCalledWith(0, -50);
+
+      document.getElementById('parent').remove();
+    });
   });
 
   describe('setParamInURL', () => {
diff --git a/spec/javascripts/lib/utils/sticky_spec.js b/spec/javascripts/lib/utils/sticky_spec.js
index c3ee3ef9825..b87c836654d 100644
--- a/spec/javascripts/lib/utils/sticky_spec.js
+++ b/spec/javascripts/lib/utils/sticky_spec.js
@@ -1,52 +1,79 @@
 import { isSticky } from '~/lib/utils/sticky';
 
 describe('sticky', () => {
-  const el = {
-    offsetTop: 0,
-    classList: {},
-  };
+  let el;
 
   beforeEach(() => {
-    el.offsetTop = 0;
-    el.classList.add = jasmine.createSpy('spy');
-    el.classList.remove = jasmine.createSpy('spy');
+    document.body.innerHTML += `
+      <div class="parent">
+        <div id="js-sticky"></div>
+      </div>
+    `;
+
+    el = document.getElementById('js-sticky');
   });
 
-  describe('classList.remove', () => {
-    it('does not call classList.remove when stuck', () => {
-      isSticky(el, 0, 0);
+  afterEach(() => {
+    el.parentNode.remove();
+  });
+
+  describe('when stuck', () => {
+    it('does not remove is-stuck class', () => {
+      isSticky(el, 0, el.offsetTop);
+      isSticky(el, 0, el.offsetTop);
 
       expect(
-        el.classList.remove,
-      ).not.toHaveBeenCalled();
+        el.classList.contains('is-stuck'),
+      ).toBeTruthy();
     });
 
-    it('calls classList.remove when not stuck', () => {
-      el.offsetTop = 10;
-      isSticky(el, 0, 0);
+    it('adds is-stuck class', () => {
+      isSticky(el, 0, el.offsetTop);
 
       expect(
-        el.classList.remove,
-      ).toHaveBeenCalledWith('is-stuck');
+        el.classList.contains('is-stuck'),
+      ).toBeTruthy();
+    });
+
+    it('inserts placeholder element', () => {
+      isSticky(el, 0, el.offsetTop, true);
+
+      expect(
+        document.querySelector('.sticky-placeholder'),
+      ).not.toBeNull();
     });
   });
 
-  describe('classList.add', () => {
-    it('calls classList.add when stuck', () => {
+  describe('when not stuck', () => {
+    it('removes is-stuck class', () => {
+      spyOn(el.classList, 'remove').and.callThrough();
+
+      isSticky(el, 0, el.offsetTop);
       isSticky(el, 0, 0);
 
       expect(
-        el.classList.add,
+        el.classList.remove,
       ).toHaveBeenCalledWith('is-stuck');
+      expect(
+        el.classList.contains('is-stuck'),
+      ).toBeFalsy();
     });
 
-    it('does not call classList.add when not stuck', () => {
-      el.offsetTop = 10;
+    it('does not add is-stuck class', () => {
       isSticky(el, 0, 0);
 
       expect(
-        el.classList.add,
-      ).not.toHaveBeenCalled();
+        el.classList.contains('is-stuck'),
+      ).toBeFalsy();
+    });
+
+    it('removes placeholder', () => {
+      isSticky(el, 0, el.offsetTop, true);
+      isSticky(el, 0, 0, true);
+
+      expect(
+        document.querySelector('.sticky-placeholder'),
+      ).toBeNull();
     });
   });
 });
diff --git a/spec/javascripts/line_highlighter_spec.js b/spec/javascripts/line_highlighter_spec.js
index aee274641e8..645664a5219 100644
--- a/spec/javascripts/line_highlighter_spec.js
+++ b/spec/javascripts/line_highlighter_spec.js
@@ -18,19 +18,25 @@ import '~/line_highlighter';
     beforeEach(function() {
       loadFixtures('static/line_highlighter.html.raw');
       this["class"] = new LineHighlighter();
-      this.css = this["class"].highlightClass;
+      this.css = this["class"].highlightLineClass;
       return this.spies = {
         __setLocationHash__: spyOn(this["class"], '__setLocationHash__').and.callFake(function() {})
       };
     });
     describe('behavior', function() {
       it('highlights one line given in the URL hash', function() {
-        new LineHighlighter('#L13');
+        new LineHighlighter({ hash: '#L13' });
         return expect($('#LC13')).toHaveClass(this.css);
       });
+      it('highlights one line given in the URL hash with given CSS class name', function() {
+        const hiliter = new LineHighlighter({ hash: '#L13', highlightLineClass: 'hilite' });
+        expect(hiliter.highlightLineClass).toBe('hilite');
+        expect($('#LC13')).toHaveClass('hilite');
+        expect($('#LC13')).not.toHaveClass('hll');
+      });
       it('highlights a range of lines given in the URL hash', function() {
         var line, results;
-        new LineHighlighter('#L5-25');
+        new LineHighlighter({ hash: '#L5-25' });
         expect($("." + this.css).length).toBe(21);
         results = [];
         for (line = 5; line <= 25; line += 1) {
@@ -41,7 +47,7 @@ import '~/line_highlighter';
       it('scrolls to the first highlighted line on initial load', function() {
         var spy;
         spy = spyOn($, 'scrollTo');
-        new LineHighlighter('#L5-25');
+        new LineHighlighter({ hash: '#L5-25' });
         return expect(spy).toHaveBeenCalledWith('#L5', jasmine.anything());
       });
       it('discards click events', function() {
@@ -50,10 +56,10 @@ import '~/line_highlighter';
         clickLine(13);
         return expect(spy).toHaveBeenPrevented();
       });
-      return it('handles garbage input from the hash', function() {
+      it('handles garbage input from the hash', function() {
         var func;
         func = function() {
-          return new LineHighlighter('#blob-content-holder');
+          return new LineHighlighter({ fileHolderSelector: '#blob-content-holder' });
         };
         return expect(func).not.toThrow();
       });
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
index eadab738376..ccdbfcba692 100644
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/spec/javascripts/merge_request_tabs_spec.js
@@ -416,5 +416,28 @@ import 'vendor/jquery.scrollTo';
         });
       });
     });
+
+    describe('expandViewContainer', function () {
+      beforeEach(() => {
+        $('body').append('<div class="content-wrapper"><div class="container-fluid container-limited"></div></div>');
+      });
+
+      afterEach(() => {
+        $('.content-wrapper').remove();
+      });
+
+      it('removes container-limited from containers', function () {
+        this.class.expandViewContainer();
+
+        expect($('.content-wrapper')).not.toContainElement('.container-limited');
+      });
+
+      it('does remove container-limited from breadcrumbs', function () {
+        $('.container-limited').addClass('breadcrumbs');
+        this.class.expandViewContainer();
+
+        expect($('.content-wrapper')).toContainElement('.container-limited');
+      });
+    });
   });
 }).call(window);
diff --git a/spec/javascripts/projects_dropdown/service/projects_service_spec.js b/spec/javascripts/projects_dropdown/service/projects_service_spec.js
index d5dd8b3449a..cfd1bb7d24f 100644
--- a/spec/javascripts/projects_dropdown/service/projects_service_spec.js
+++ b/spec/javascripts/projects_dropdown/service/projects_service_spec.js
@@ -34,7 +34,7 @@ describe('ProjectsService', () => {
 
       const searchQuery = 'lab';
       const queryParams = {
-        simple: false,
+        simple: true,
         per_page: 20,
         membership: true,
         order_by: 'last_activity_at',
diff --git a/spec/javascripts/repo/components/repo_edit_button_spec.js b/spec/javascripts/repo/components/repo_edit_button_spec.js
index 29dc2d21e4b..411514009dc 100644
--- a/spec/javascripts/repo/components/repo_edit_button_spec.js
+++ b/spec/javascripts/repo/components/repo_edit_button_spec.js
@@ -21,13 +21,11 @@ describe('RepoEditButton', () => {
     expect(vm.$el.textContent).toMatch('Edit');
 
     spyOn(vm, 'editCancelClicked').and.callThrough();
-    spyOn(vm, 'toggleProjectRefsForm');
 
     vm.$el.click();
 
     Vue.nextTick(() => {
       expect(vm.editCancelClicked).toHaveBeenCalled();
-      expect(vm.toggleProjectRefsForm).toHaveBeenCalled();
       expect(vm.$el.textContent).toMatch('Cancel edit');
       done();
     });
diff --git a/spec/javascripts/repo/components/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js
index 518a2d25ecf..f15633bd8b9 100644
--- a/spec/javascripts/repo/components/repo_file_spec.js
+++ b/spec/javascripts/repo/components/repo_file_spec.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import repoFile from '~/repo/components/repo_file.vue';
+import RepoStore from '~/repo/stores/repo_store';
 
 describe('RepoFile', () => {
   const updated = 'updated';
@@ -12,8 +13,13 @@ describe('RepoFile', () => {
     level: 10,
   };
   const activeFile = {
+    pageTitle: 'pageTitle',
     url: 'url',
   };
+  const otherFile = {
+    html: '<p class="file-content">html</p>',
+    pageTitle: 'otherpageTitle',
+  };
 
   function createComponent(propsData) {
     const RepoFile = Vue.extend(repoFile);
@@ -60,6 +66,12 @@ describe('RepoFile', () => {
     expect(vm.$el.querySelector('.fa-spin.fa-spinner')).toBeFalsy();
   });
 
+  it('sets the document title correctly', () => {
+    RepoStore.setActiveFiles(otherFile);
+
+    expect(document.title.trim()).toEqual(otherFile.pageTitle);
+  });
+
   it('renders a spinner if the file is loading', () => {
     file.loading = true;
     const vm = createComponent({
diff --git a/spec/javascripts/repo/components/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js
index abcff8e537e..db9911c7a2c 100644
--- a/spec/javascripts/repo/components/repo_sidebar_spec.js
+++ b/spec/javascripts/repo/components/repo_sidebar_spec.js
@@ -79,6 +79,20 @@ describe('RepoSidebar', () => {
         expect(Helper.getContent).toHaveBeenCalledWith(file1);
       });
 
+      it('should not fetch data for already opened files', () => {
+        const file = {
+          id: 42,
+          url: 'foo',
+        };
+
+        spyOn(Helper, 'getFileFromPath').and.returnValue(file);
+        spyOn(RepoStore, 'setActiveFiles');
+        const vm = createComponent();
+        vm.fileClicked(file);
+
+        expect(RepoStore.setActiveFiles).toHaveBeenCalledWith(file);
+      });
+
       it('should hide files in directory if already open', () => {
         spyOn(RepoStore, 'removeChildFilesOfTree').and.callThrough();
         const file1 = {
diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js
index f2072a6f350..5505f983d71 100644
--- a/spec/javascripts/right_sidebar_spec.js
+++ b/spec/javascripts/right_sidebar_spec.js
@@ -32,56 +32,86 @@ import '~/right_sidebar';
   };
 
   describe('RightSidebar', function() {
-    var fixtureName = 'issues/open-issue.html.raw';
-    preloadFixtures(fixtureName);
-    loadJSONFixtures('todos/todos.json');
-
-    beforeEach(function() {
-      loadFixtures(fixtureName);
-      this.sidebar = new Sidebar;
-      $aside = $('.right-sidebar');
-      $page = $('.page-with-sidebar');
-      $icon = $aside.find('i');
-      $toggle = $aside.find('.js-sidebar-toggle');
-      return $labelsIcon = $aside.find('.sidebar-collapsed-icon');
-    });
-    it('should expand/collapse the sidebar when arrow is clicked', function() {
-      assertSidebarState('expanded');
-      $toggle.click();
-      assertSidebarState('collapsed');
-      $toggle.click();
-      assertSidebarState('expanded');
-    });
-    it('should float over the page and when sidebar icons clicked', function() {
-      $labelsIcon.click();
-      return assertSidebarState('expanded');
-    });
-    it('should collapse when the icon arrow clicked while it is floating on page', function() {
-      $labelsIcon.click();
-      assertSidebarState('expanded');
-      $toggle.click();
-      return assertSidebarState('collapsed');
+    describe('fixture tests', () => {
+      var fixtureName = 'issues/open-issue.html.raw';
+      preloadFixtures(fixtureName);
+      loadJSONFixtures('todos/todos.json');
+
+      beforeEach(function() {
+        loadFixtures(fixtureName);
+        this.sidebar = new Sidebar;
+        $aside = $('.right-sidebar');
+        $page = $('.page-with-sidebar');
+        $icon = $aside.find('i');
+        $toggle = $aside.find('.js-sidebar-toggle');
+        return $labelsIcon = $aside.find('.sidebar-collapsed-icon');
+      });
+      it('should expand/collapse the sidebar when arrow is clicked', function() {
+        assertSidebarState('expanded');
+        $toggle.click();
+        assertSidebarState('collapsed');
+        $toggle.click();
+        assertSidebarState('expanded');
+      });
+      it('should float over the page and when sidebar icons clicked', function() {
+        $labelsIcon.click();
+        return assertSidebarState('expanded');
+      });
+      it('should collapse when the icon arrow clicked while it is floating on page', function() {
+        $labelsIcon.click();
+        assertSidebarState('expanded');
+        $toggle.click();
+        return assertSidebarState('collapsed');
+      });
+
+      it('should broadcast todo:toggle event when add todo clicked', function() {
+        var todos = getJSONFixture('todos/todos.json');
+        spyOn(jQuery, 'ajax').and.callFake(function() {
+          var d = $.Deferred();
+          var response = todos;
+          d.resolve(response);
+          return d.promise();
+        });
+
+        var todoToggleSpy = spyOnEvent(document, 'todo:toggle');
+
+        $('.issuable-sidebar-header .js-issuable-todo').click();
+
+        expect(todoToggleSpy.calls.count()).toEqual(1);
+      });
+
+      it('should not hide collapsed icons', () => {
+        [].forEach.call(document.querySelectorAll('.sidebar-collapsed-icon'), (el) => {
+          expect(el.querySelector('.fa, svg').classList.contains('hidden')).toBeFalsy();
+        });
+      });
     });
 
-    it('should broadcast todo:toggle event when add todo clicked', function() {
-      var todos = getJSONFixture('todos/todos.json');
-      spyOn(jQuery, 'ajax').and.callFake(function() {
-        var d = $.Deferred();
-        var response = todos;
-        d.resolve(response);
-        return d.promise();
+    describe('sidebarToggleClicked', () => {
+      const event = jasmine.createSpyObj('event', ['preventDefault']);
+
+      beforeEach(() => {
+        spyOn($.fn, 'hasClass').and.returnValue(false);
+      });
+
+      afterEach(() => {
+        gl.lazyLoader = undefined;
       });
 
-      var todoToggleSpy = spyOnEvent(document, 'todo:toggle');
+      it('calls loadCheck if lazyLoader is set', () => {
+        gl.lazyLoader = jasmine.createSpyObj('lazyLoader', ['loadCheck']);
 
-      $('.issuable-sidebar-header .js-issuable-todo').click();
+        Sidebar.prototype.sidebarToggleClicked(event);
 
-      expect(todoToggleSpy.calls.count()).toEqual(1);
-    });
+        expect(gl.lazyLoader.loadCheck).toHaveBeenCalled();
+      });
+
+      it('does not throw if lazyLoader is not defined', () => {
+        gl.lazyLoader = undefined;
+
+        const toggle = Sidebar.prototype.sidebarToggleClicked.bind(null, event);
 
-    it('should not hide collapsed icons', () => {
-      [].forEach.call(document.querySelectorAll('.sidebar-collapsed-icon'), (el) => {
-        expect(el.querySelector('.fa, svg').classList.contains('hidden')).toBeFalsy();
+        expect(toggle).not.toThrow();
       });
     });
   });