Add latest changes from gitlab-org/gitlab@master

5 files changed, 12 insertions, 6 deletions

diff --git a/spec/frontend/__helpers__/dom_shims/get_client_rects.js b/spec/frontend/__helpers__/dom_shims/get_client_rects.js
index 7ba60dd7936..0ec3525f0ef 100644
--- a/spec/frontend/__helpers__/dom_shims/get_client_rects.js
+++ b/spec/frontend/__helpers__/dom_shims/get_client_rects.js
@@ -1,7 +1,8 @@
 function hasHiddenStyle(node) {
   if (!node.style) {
     return false;
-  } else if (node.style.display === 'none' || node.style.visibility === 'hidden') {
+  }
+  if (node.style.display === 'none' || node.style.visibility === 'hidden') {
     return true;
   }
 
diff --git a/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js b/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js
index 7044618fd9e..154347b08b5 100644
--- a/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js
+++ b/spec/frontend/behaviors/markdown/paste_markdown_table_spec.js
@@ -77,7 +77,8 @@ describe('PasteMarkdownTable', () => {
       data.getData = jest.fn().mockImplementation((type) => {
         if (type === 'text/html') {
           return '<table><tr><td>First</td><td>Last</td><tr><td>John</td><td>Doe</td><tr><td>Jane</td><td>Doe</td></table>';
-        } else if (type === 'text/plain') {
+        }
+        if (type === 'text/plain') {
           return 'First\tLast\nJohn\tDoe\nJane\tDoe';
         }
 
@@ -102,7 +103,8 @@ describe('PasteMarkdownTable', () => {
       data.getData = jest.fn().mockImplementation((type) => {
         if (type === 'text/html') {
           return '<table><tr><td>First</td><td>Last</td><tr><td>John</td><td>Doe</td><tr><td>Jane</td><td>/td></table>';
-        } else if (type === 'text/plain') {
+        }
+        if (type === 'text/plain') {
           return 'First\tLast\nJohn\tDoe\nJane';
         }
 
diff --git a/spec/frontend/diffs/components/diff_row_spec.js b/spec/frontend/diffs/components/diff_row_spec.js
index 8a67d7b152c..30510958704 100644
--- a/spec/frontend/diffs/components/diff_row_spec.js
+++ b/spec/frontend/diffs/components/diff_row_spec.js
@@ -71,7 +71,8 @@ describe('DiffRow', () => {
         const hits = coverageFileData[file]?.[line];
         if (hits) {
           return { text: `Test coverage: ${hits} hits`, class: 'coverage' };
-        } else if (hits === 0) {
+        }
+        if (hits === 0) {
           return { text: 'No test coverage', class: 'no-coverage' };
         }
 
diff --git a/spec/frontend/nav/components/top_nav_new_dropdown_spec.js b/spec/frontend/nav/components/top_nav_new_dropdown_spec.js
index 2cd65307b0b..432ee5e9ecd 100644
--- a/spec/frontend/nav/components/top_nav_new_dropdown_spec.js
+++ b/spec/frontend/nav/components/top_nav_new_dropdown_spec.js
@@ -57,7 +57,8 @@ describe('~/nav/components/top_nav_menu_sections.vue', () => {
 
         if (type === 'divider') {
           return { type };
-        } else if (type === 'header') {
+        }
+        if (type === 'header') {
           return { type, text: child.text() };
         }
 
diff --git a/spec/frontend/users_select/test_helper.js b/spec/frontend/users_select/test_helper.js
index b38400446a9..5aae922fec2 100644
--- a/spec/frontend/users_select/test_helper.js
+++ b/spec/frontend/users_select/test_helper.js
@@ -70,7 +70,8 @@ export const findDropdownItemsModel = () =>
       return {
         type: 'divider',
       };
-    } else if (el.classList.contains('dropdown-header')) {
+    }
+    if (el.classList.contains('dropdown-header')) {
       return {
         type: 'dropdown-header',
         text: el.textContent,