1 files changed, 29 insertions, 21 deletions

diff --git a/spec/javascripts/gpg_badges_spec.js b/spec/javascripts/gpg_badges_spec.js
index 7a826487bf9..5decb5e6bbd 100644
--- a/spec/javascripts/gpg_badges_spec.js
+++ b/spec/javascripts/gpg_badges_spec.js
@@ -1,6 +1,9 @@
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 import GpgBadges from '~/gpg_badges';
 
 describe('GpgBadges', () => {
+  let mock;
   const dummyCommitSha = 'n0m0rec0ffee';
   const dummyBadgeHtml = 'dummy html';
   const dummyResponse = {
@@ -11,38 +14,43 @@ describe('GpgBadges', () => {
   };
 
   beforeEach(() => {
+    mock = new MockAdapter(axios);
     setFixtures(`
+      <form 
+        class="commits-search-form" data-signatures-path="/hello" action="/hello"
+        method="get">
+        <input name="utf8" type="hidden" value="✓">
+        <input type="search" name="search" id="commits-search"class="form-control search-text-input input-short">
+      </form>
       <div class="parent-container">
         <div class="js-loading-gpg-badge" data-commit-sha="${dummyCommitSha}"></div>
       </div>
     `);
   });
 
-  it('displays a loading spinner', () => {
-    spyOn($, 'get').and.returnValue({
-      done() {
-        // intentionally left blank
-      },
-    });
+  afterEach(() => {
+    mock.restore();
+  });
 
-    GpgBadges.fetch();
+  it('displays a loading spinner', (done) => {
+    mock.onGet('/hello').reply(200);
 
-    expect(document.querySelector('.js-loading-gpg-badge:empty')).toBe(null);
-    const spinners = document.querySelectorAll('.js-loading-gpg-badge i.fa.fa-spinner.fa-spin');
-    expect(spinners.length).toBe(1);
+    GpgBadges.fetch().then(() => {
+      expect(document.querySelector('.js-loading-gpg-badge:empty')).toBe(null);
+      const spinners = document.querySelectorAll('.js-loading-gpg-badge i.fa.fa-spinner.fa-spin');
+      expect(spinners.length).toBe(1);
+      done();
+    }).catch(done.fail);
   });
 
-  it('replaces the loading spinner', () => {
-    spyOn($, 'get').and.returnValue({
-      done(callback) {
-        callback(dummyResponse);
-      },
-    });
-
-    GpgBadges.fetch();
+  it('replaces the loading spinner', (done) => {
+    mock.onGet('/hello').reply(200, dummyResponse);
 
-    expect(document.querySelector('.js-loading-gpg-badge')).toBe(null);
-    const parentContainer = document.querySelector('.parent-container');
-    expect(parentContainer.innerHTML.trim()).toEqual(dummyBadgeHtml);
+    GpgBadges.fetch().then(() => {
+      expect(document.querySelector('.js-loading-gpg-badge')).toBe(null);
+      const parentContainer = document.querySelector('.parent-container');
+      expect(parentContainer.innerHTML.trim()).toEqual(dummyBadgeHtml);
+      done();
+    }).catch(done.fail);
   });
 });