Merge branch '51712-no-promise-without-done-fail' into 'master'

2. enable jasmine/no-promise-without-done-fail

See merge request gitlab-org/gitlab-ce!22231

7 files changed, 17 insertions, 19 deletions

diff --git a/spec/javascripts/.eslintrc.yml b/spec/javascripts/.eslintrc.yml
index 1448849a0b7..1328b7c362b 100644
--- a/spec/javascripts/.eslintrc.yml
+++ b/spec/javascripts/.eslintrc.yml
@@ -37,5 +37,4 @@ rules:
       - 'fixtures/blob'
   # Temporarily disabled to facilitate an upgrade to eslint-plugin-jasmine
   jasmine/new-line-before-expect: off
-  jasmine/no-promise-without-done-fail: off
   jasmine/prefer-toHaveBeenCalledWith: off
diff --git a/spec/javascripts/boards/components/board_spec.js b/spec/javascripts/boards/components/board_spec.js
index 4ebd4cecc08..d4c53bd5a7d 100644
--- a/spec/javascripts/boards/components/board_spec.js
+++ b/spec/javascripts/boards/components/board_spec.js
@@ -112,6 +112,6 @@ describe('Board component', () => {
         ).toBe(true);
 
         done();
-      });
+      }).catch(done.fail);
   });
 });
diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index c34622203f7..b2b8f64d705 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -1,4 +1,3 @@
-/* eslint-disable promise/catch-or-return */
 import axios from '~/lib/utils/axios_utils';
 import * as commonUtils from '~/lib/utils/common_utils';
 import MockAdapter from 'axios-mock-adapter';
@@ -360,10 +359,10 @@ describe('common_utils', () => {
         }).then((resp) => {
           stop(resp);
         })
-      )).then((respBackoff) => {
+      ).catch(done.fail)).then((respBackoff) => {
         expect(respBackoff).toBe(expectedResponseValue);
         done();
-      });
+      }).catch(done.fail);
     });
 
     it('catches the rejected promise from the callback ', (done) => {
@@ -394,12 +393,12 @@ describe('common_utils', () => {
               stop(resp);
             }
           })
-      )).then((respBackoff) => {
+      ).catch(done.fail)).then((respBackoff) => {
         const timeouts = window.setTimeout.calls.allArgs().map(([, timeout]) => timeout);
         expect(timeouts).toEqual([2000, 4000]);
         expect(respBackoff).toBe(expectedResponseValue);
         done();
-      });
+      }).catch(done.fail);
     });
 
     it('rejects the backOff promise after timing out', (done) => {
@@ -460,7 +459,7 @@ describe('common_utils', () => {
       commonUtils.createOverlayIcon(faviconDataUrl, overlayDataUrl).then((url) => {
         expect(url).toEqual(faviconWithOverlayDataUrl);
         done();
-      });
+      }).catch(done.fail);
     });
   });
 
@@ -480,7 +479,7 @@ describe('common_utils', () => {
       commonUtils.setFaviconOverlay(overlayDataUrl).then(() => {
         expect(document.getElementById('favicon').getAttribute('href')).toEqual(faviconWithOverlayDataUrl);
         done();
-      });
+      }).catch(done.fail);
     });
   });
 
diff --git a/spec/javascripts/pipelines/pipelines_spec.js b/spec/javascripts/pipelines/pipelines_spec.js
index 50141bd99b4..ab4c00a79ef 100644
--- a/spec/javascripts/pipelines/pipelines_spec.js
+++ b/spec/javascripts/pipelines/pipelines_spec.js
@@ -719,7 +719,7 @@ describe('Pipelines', () => {
                 expect(vm.poll.restart).toHaveBeenCalled();
                 done();
               }, 0);
-            });
+            }).catch(done.fail);
         }, 0);
       });
     });
diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js
index 21805ef0b28..345a7c551d1 100644
--- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js
+++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js
@@ -96,8 +96,8 @@ describe('GkeMachineTypeDropdown', () => {
         return vm.$nextTick().then(() => {
           expect(vm.$el.querySelector('input').value).toBe(selectedMachineTypeMock);
           done();
-        });
-      });
+        }).catch(done.fail);
+      }).catch(done.fail);
     });
   });
 });
diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js
index d4fcb2dc8ff..3d1a0b87bb8 100644
--- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js
+++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js
@@ -57,13 +57,13 @@ describe('GkeProjectIdDropdown', () => {
 
         expect(vm.toggleText).toBe(LABELS.DEFAULT);
         done();
-      }));
+      }).catch(done.fail));
 
     it('returns project name if project selected', done =>
       vm.$nextTick().then(() => {
         expect(vm.toggleText).toBe(selectedProjectMock.name);
         done();
-      }));
+      }).catch(done.fail));
 
     it('returns empty toggle text', done =>
       vm.$nextTick().then(() => {
@@ -72,7 +72,7 @@ describe('GkeProjectIdDropdown', () => {
 
         expect(vm.toggleText).toBe(LABELS.EMPTY);
         done();
-      }));
+      }).catch(done.fail));
   });
 
   describe('selectItem', () => {
@@ -85,8 +85,8 @@ describe('GkeProjectIdDropdown', () => {
         return vm.$nextTick().then(() => {
           expect(vm.$el.querySelector('input').value).toBe(selectedProjectMock.projectId);
           done();
-        });
-      });
+        }).catch(done.fail);
+      }).catch(done.fail);
     });
   });
 });
diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js
index 89a4a7ea2ce..a07e00845cf 100644
--- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js
+++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js
@@ -81,8 +81,8 @@ describe('GkeZoneDropdown', () => {
         return vm.$nextTick().then(() => {
           expect(vm.$el.querySelector('input').value).toBe(selectedZoneMock);
           done();
-        });
-      });
+        }).catch(done.fail);
+      }).catch(done.fail);
     });
   });
 });