Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 8 insertions, 20 deletions

diff --git a/spec/frontend/commits_spec.js b/spec/frontend/commits_spec.js
index 8189ebe6e55..a049a6997f0 100644
--- a/spec/frontend/commits_spec.js
+++ b/spec/frontend/commits_spec.js
@@ -70,29 +70,17 @@ describe('Commits List', () => {
       mock.restore();
     });
 
-    it('should save the last search string', (done) => {
+    it('should save the last search string', async () => {
       commitsList.searchField.val('GitLab');
-      commitsList
-        .filterResults()
-        .then(() => {
-          expect(ajaxSpy).toHaveBeenCalled();
-          expect(commitsList.lastSearch).toEqual('GitLab');
-
-          done();
-        })
-        .catch(done.fail);
+      await commitsList.filterResults();
+      expect(ajaxSpy).toHaveBeenCalled();
+      expect(commitsList.lastSearch).toEqual('GitLab');
     });
 
-    it('should not make ajax call if the input does not change', (done) => {
-      commitsList
-        .filterResults()
-        .then(() => {
-          expect(ajaxSpy).not.toHaveBeenCalled();
-          expect(commitsList.lastSearch).toEqual('');
-
-          done();
-        })
-        .catch(done.fail);
+    it('should not make ajax call if the input does not change', async () => {
+      await commitsList.filterResults();
+      expect(ajaxSpy).not.toHaveBeenCalled();
+      expect(commitsList.lastSearch).toEqual('');
     });
   });
 });