Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 18 deletions

diff --git a/spec/frontend/diffs/components/diff_file_header_spec.js b/spec/frontend/diffs/components/diff_file_header_spec.js
index 1b41456f2f5..e9a63e861ed 100644
--- a/spec/frontend/diffs/components/diff_file_header_spec.js
+++ b/spec/frontend/diffs/components/diff_file_header_spec.js
@@ -62,7 +62,7 @@ describe('DiffFileHeader component', () => {
       diffHasDiscussionsResultMock,
       diffHasExpandedDiscussionsResultMock,
       ...Object.values(mockStoreConfig.modules.diffs.actions),
-    ].forEach(mock => mock.mockReset());
+    ].forEach((mock) => mock.mockReset());
 
     wrapper.destroy();
   });
@@ -80,7 +80,7 @@ describe('DiffFileHeader component', () => {
   const findCollapseIcon = () => wrapper.find({ ref: 'collapseIcon' });
   const findEditButton = () => wrapper.find({ ref: 'editButton' });
 
-  const createComponent = props => {
+  const createComponent = (props) => {
     mockStoreConfig = cloneDeep(defaultMockStoreConfig);
     const store = new Vuex.Store(mockStoreConfig);
 
@@ -219,7 +219,7 @@ describe('DiffFileHeader component', () => {
   });
 
   describe('for any file', () => {
-    const otherModes = Object.keys(diffViewerModes).filter(m => m !== 'mode_changed');
+    const otherModes = Object.keys(diffViewerModes).filter((m) => m !== 'mode_changed');
 
     it('for mode_changed file mode displays mode changes', () => {
       createComponent({
@@ -236,20 +236,23 @@ describe('DiffFileHeader component', () => {
       expect(findModeChangedLine().text()).toMatch(/old-mode.+new-mode/);
     });
 
-    it.each(otherModes.map(m => [m]))('for %s file mode does not display mode changes', mode => {
-      createComponent({
-        diffFile: {
-          ...diffFile,
-          a_mode: 'old-mode',
-          b_mode: 'new-mode',
-          viewer: {
-            ...diffFile.viewer,
-            name: diffViewerModes[mode],
+    it.each(otherModes.map((m) => [m]))(
+      'for %s file mode does not display mode changes',
+      (mode) => {
+        createComponent({
+          diffFile: {
+            ...diffFile,
+            a_mode: 'old-mode',
+            b_mode: 'new-mode',
+            viewer: {
+              ...diffFile.viewer,
+              name: diffViewerModes[mode],
+            },
           },
-        },
-      });
-      expect(findModeChangedLine().exists()).toBeFalsy();
-    });
+        });
+        expect(findModeChangedLine().exists()).toBeFalsy();
+      },
+    );
 
     it('displays the LFS label for files stored in LFS', () => {
       createComponent({
diff --git a/spec/frontend/diffs/components/hidden_files_warning_spec.js b/spec/frontend/diffs/components/hidden_files_warning_spec.js
index 6fb4e4645f8..3f1f23a40f5 100644
--- a/spec/frontend/diffs/components/hidden_files_warning_spec.js
+++ b/spec/frontend/diffs/components/hidden_files_warning_spec.js
@@ -26,13 +26,15 @@ describe('HiddenFilesWarning', () => {
   });
 
   it('has a correct plain diff URL', () => {
-    const plainDiffLink = wrapper.findAll('a').wrappers.filter(x => x.text() === 'Plain diff')[0];
+    const plainDiffLink = wrapper.findAll('a').wrappers.filter((x) => x.text() === 'Plain diff')[0];
 
     expect(plainDiffLink.attributes('href')).toBe(propsData.plainDiffPath);
   });
 
   it('has a correct email patch URL', () => {
-    const emailPatchLink = wrapper.findAll('a').wrappers.filter(x => x.text() === 'Email patch')[0];
+    const emailPatchLink = wrapper
+      .findAll('a')
+      .wrappers.filter((x) => x.text() === 'Email patch')[0];
 
     expect(emailPatchLink.attributes('href')).toBe(propsData.emailPatchPath);
   });