Add latest changes from gitlab-org/gitlab@master

9 files changed, 39 insertions, 31 deletions

diff --git a/spec/features/projects/services/user_activates_issue_tracker_spec.rb b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
index 5f3bb794b48..0b0a3362043 100644
--- a/spec/features/projects/services/user_activates_issue_tracker_spec.rb
+++ b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
@@ -8,16 +8,15 @@ describe 'User activates issue tracker', :js do
 
   let(:url) { 'http://tracker.example.com' }
 
-  def fill_short_form(active = true)
-    check 'Active' if active
+  def fill_short_form(disabled: false)
+    uncheck 'Active' if disabled
 
     fill_in 'service_project_url', with: url
     fill_in 'service_issues_url', with: "#{url}/:id"
   end
 
-  def fill_full_form(active = true)
-    fill_short_form(active)
-    check 'Active' if active
+  def fill_full_form(disabled: false)
+    fill_short_form(disabled: disabled)
 
     fill_in 'service_new_issue_url', with: url
   end
@@ -86,14 +85,14 @@ describe 'User activates issue tracker', :js do
       end
     end
 
-    describe 'user sets the service but keeps it disabled' do
+    describe 'user disables the service' do
       before do
         click_link(tracker)
 
         if skip_new_issue_url
-          fill_short_form(false)
+          fill_short_form(disabled: true)
         else
-          fill_full_form(false)
+          fill_full_form(disabled: true)
         end
 
         click_button('Save changes')
diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/services/user_activates_jira_spec.rb
index 7847b7d5177..557615f8872 100644
--- a/spec/features/projects/services/user_activates_jira_spec.rb
+++ b/spec/features/projects/services/user_activates_jira_spec.rb
@@ -9,8 +9,8 @@ describe 'User activates Jira', :js do
   let(:url) { 'http://jira.example.com' }
   let(:test_url) { 'http://jira.example.com/rest/api/2/serverInfo' }
 
-  def fill_form(active = true)
-    check 'Active' if active
+  def fill_form(disabled: false)
+    uncheck 'Active' if disabled
 
     fill_in 'service_url', with: url
     fill_in 'service_username', with: 'username'
@@ -83,10 +83,10 @@ describe 'User activates Jira', :js do
     end
   end
 
-  describe 'user sets Jira Service but keeps it disabled' do
+  describe 'user disables the Jira Service' do
     before do
       click_link('Jira')
-      fill_form(false)
+      fill_form(disabled: true)
       click_button('Save changes')
     end
 
diff --git a/spec/features/projects/services/user_activates_youtrack_spec.rb b/spec/features/projects/services/user_activates_youtrack_spec.rb
index 8fdeddfdfb4..2f6aad1d736 100644
--- a/spec/features/projects/services/user_activates_youtrack_spec.rb
+++ b/spec/features/projects/services/user_activates_youtrack_spec.rb
@@ -8,8 +8,8 @@ describe 'User activates issue tracker', :js do
 
   let(:url) { 'http://tracker.example.com' }
 
-  def fill_form(active = true)
-    check 'Active' if active
+  def fill_form(disabled: false)
+    uncheck 'Active' if disabled
 
     fill_in 'service_project_url', with: url
     fill_in 'service_issues_url', with: "#{url}/:id"
@@ -67,10 +67,10 @@ describe 'User activates issue tracker', :js do
       end
     end
 
-    describe 'user sets the service but keeps it disabled' do
+    describe 'user disables the service' do
       before do
         click_link(tracker)
-        fill_form(false)
+        fill_form(disabled: true)
         click_button('Save changes')
       end
 
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb
index 7e0ee861b18..829b01832df 100644
--- a/spec/features/projects/tree/create_directory_spec.rb
+++ b/spec/features/projects/tree/create_directory_spec.rb
@@ -46,6 +46,13 @@ describe 'Multi-file editor new directory', :js do
 
     find('.js-ide-commit-mode').click
 
+    # Compact mode depends on the size of window. If it is shorter than MAX_WINDOW_HEIGHT_COMPACT,
+    # (as it is with CHROME_HEADLESS=0), this initial commit button will exist. Otherwise, if it is
+    # taller (as it is by default with chrome headless) then the button will not exist.
+    if page.has_css?('.qa-begin-commit-button')
+      find('.qa-begin-commit-button').click
+    end
+
     fill_in('commit-message', with: 'commit message ide')
 
     find(:css, ".js-ide-commit-new-mr input").set(false)
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
index eba33168006..58ff623c9ae 100644
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -36,6 +36,13 @@ describe 'Multi-file editor new file', :js do
 
     find('.js-ide-commit-mode').click
 
+    # Compact mode depends on the size of window. If it is shorter than MAX_WINDOW_HEIGHT_COMPACT,
+    # (as it is with CHROME_HEADLESS=0), this initial commit button will exist. Otherwise, if it is
+    # taller (as it is by default with chrome headless) then the button will not exist.
+    if page.has_css?('.qa-begin-commit-button')
+      find('.qa-begin-commit-button').click
+    end
+
     fill_in('commit-message', with: 'commit message ide')
 
     find(:css, ".js-ide-commit-new-mr input").set(false)
diff --git a/spec/frontend/boards/issue_card_spec.js b/spec/frontend/boards/issue_card_spec.js
index df55a106945..08cffed5f00 100644
--- a/spec/frontend/boards/issue_card_spec.js
+++ b/spec/frontend/boards/issue_card_spec.js
@@ -1,6 +1,6 @@
 /* global ListAssignee, ListLabel, ListIssue */
 import { mount } from '@vue/test-utils';
-import _ from 'underscore';
+import { range } from 'lodash';
 import '~/boards/models/label';
 import '~/boards/models/assignee';
 import '~/boards/models/issue';
@@ -222,7 +222,7 @@ describe('Issue card component', () => {
       it('renders 99+ avatar counter', done => {
         const assignees = [
           ...wrapper.props('issue').assignees,
-          ..._.range(5, 103).map(
+          ...range(5, 103).map(
             i =>
               new ListAssignee({
                 id: i,
diff --git a/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js b/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js
index 3ce105f27e4..d924f895da8 100644
--- a/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js
+++ b/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js
@@ -1,4 +1,4 @@
-import _ from 'underscore';
+import { pick, clone } from 'lodash';
 import Vuex from 'vuex';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
@@ -15,7 +15,7 @@ describe('error tracking settings project dropdown', () => {
     wrapper = shallowMount(ProjectDropdown, {
       localVue,
       propsData: {
-        ..._.pick(
+        ...pick(
           defaultProps,
           'dropdownLabel',
           'invalidProjectLabel',
@@ -65,7 +65,7 @@ describe('error tracking settings project dropdown', () => {
 
   describe('populated project list', () => {
     beforeEach(() => {
-      wrapper.setProps({ projects: _.clone(projectList), hasProjects: true });
+      wrapper.setProps({ projects: clone(projectList), hasProjects: true });
 
       return wrapper.vm.$nextTick();
     });
@@ -82,10 +82,10 @@ describe('error tracking settings project dropdown', () => {
   });
 
   describe('selected project', () => {
-    const selectedProject = _.clone(projectList[0]);
+    const selectedProject = clone(projectList[0]);
 
     beforeEach(() => {
-      wrapper.setProps({ projects: _.clone(projectList), selectedProject, hasProjects: true });
+      wrapper.setProps({ projects: clone(projectList), selectedProject, hasProjects: true });
       return wrapper.vm.$nextTick();
     });
 
@@ -98,7 +98,7 @@ describe('error tracking settings project dropdown', () => {
   describe('invalid project selected', () => {
     beforeEach(() => {
       wrapper.setProps({
-        projects: _.clone(projectList),
+        projects: clone(projectList),
         selectedProject: staleProject,
         isProjectInvalid: true,
       });
diff --git a/spec/frontend/notes/old_notes_spec.js b/spec/frontend/notes/old_notes_spec.js
index c1c9d5cef4a..5f7a5d57cd8 100644
--- a/spec/frontend/notes/old_notes_spec.js
+++ b/spec/frontend/notes/old_notes_spec.js
@@ -1,7 +1,6 @@
 /* eslint-disable import/no-commonjs, no-new */
 
 import $ from 'jquery';
-import _ from 'underscore';
 import MockAdapter from 'axios-mock-adapter';
 import '~/behaviors/markdown/render_gfm';
 import { createSpyObj } from 'helpers/jest_helpers';
@@ -792,14 +791,11 @@ describe('Old Notes (~/notes.js)', () => {
     });
 
     it('should return form metadata with sanitized formContent from form reference', () => {
-      jest.spyOn(_, 'escape');
-
       sampleComment = '<script>alert("Boom!");</script>';
       $form.find('textarea.js-note-text').val(sampleComment);
 
       const { formContent } = notes.getFormData($form);
 
-      expect(_.escape).toHaveBeenCalledWith(sampleComment);
       expect(formContent).toEqual('&lt;script&gt;alert(&quot;Boom!&quot;);&lt;/script&gt;');
     });
   });
@@ -990,7 +986,6 @@ describe('Old Notes (~/notes.js)', () => {
 
     beforeEach(() => {
       notes = new Notes('', []);
-      jest.spyOn(_, 'escape');
     });
 
     it('should return constructed placeholder element for system note based on form contents', () => {
diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
index 2f68e15b0d7..902e83da7be 100644
--- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
+++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
@@ -1,4 +1,4 @@
-import _ from 'underscore';
+import { each } from 'lodash';
 import { trimText } from 'helpers/text_helper';
 import { shallowMount } from '@vue/test-utils';
 import { GlLink } from '@gitlab/ui';
@@ -58,7 +58,7 @@ describe('User Avatar Link Component', () => {
   });
 
   it('should return necessary props as defined', () => {
-    _.each(defaultProps, (val, key) => {
+    each(defaultProps, (val, key) => {
       expect(wrapper.vm[key]).toBeDefined();
     });
   });