Remove need for sinon

addons/addon-ligatures/package.json

@@ -36,10 +36,8 @@
     "font-ligatures": "^1.4.1"
   },
   "devDependencies": {
-    "@types/sinon": "^5.0.1",
     "axios": "^1.6.0",
     "mkdirp": "0.5.5",
-    "sinon": "6.3.5",
     "yauzl": "^2.10.0"
   }
 }

addons/addon-ligatures/src/index.test.ts

@@ -4,61 +4,61 @@
  */
 
 import * as path from 'path';
-import * as sinon from 'sinon';
 import { assert } from 'chai';
 import * as fontFinder from 'font-finder';
 
 import * as ligatureSupport from '.';
 
+const originalList = fontFinder.list;
+
 describe('LigaturesAddon', () => {
-  let onRefresh: sinon.SinonStub;
+  let onRefresh: { called: boolean, callCount: number, (...args: any[]): void };
   let term: MockTerminal;
 
-  // -> forms a ligature in Fira Code and Iosevka, but www only forms a ligature
-  // in Fira Code
   const input = 'a -> b www c';
 
   before(() => {
-    sinon.stub(fontFinder, 'list').returns(Promise.resolve({
-
+    (fontFinder as any).list = () => Promise.resolve({
       'Fira Code': [{
         path: path.join(__dirname, '../fonts/firaCode.otf'),
         style: fontFinder.Style.Regular,
         type: fontFinder.Type.Monospace,
         weight: 400
       }],
-
       'Iosevka': [{
         path: path.join(__dirname, '../fonts/iosevka.ttf'),
         style: fontFinder.Style.Regular,
         type: fontFinder.Type.Monospace,
         weight: 400
       }],
-
       'Nonexistant Font': [{
         path: path.join(__dirname, '../fonts/nonexistant.ttf'),
         style: fontFinder.Style.Regular,
         type: fontFinder.Type.Monospace,
         weight: 400
       }]
-    } as fontFinder.FontList));
+    } as fontFinder.FontList);
+  });
+
+  after(() => {
+    (fontFinder as any).list = originalList;
   });
 
   beforeEach(() => {
-    onRefresh = sinon.stub();
+    onRefresh = Object.assign((..._args: any[]) => { onRefresh.called = true; onRefresh.callCount++; }, { called: false, callCount: 0 });
     term = new MockTerminal(onRefresh);
     ligatureSupport.enableLigatures(term as any);
   });
 
   it('registers itself correctly', () => {
-    const term = new MockTerminal(sinon.spy());
+    const term = new MockTerminal(() => {});
     assert.isUndefined(term.joiner);
     ligatureSupport.enableLigatures(term as any);
     assert.isFunction(term.joiner);
   });
 
   it('registers itself correctly when called directly', () => {
-    const term = new MockTerminal(sinon.spy());
+    const term = new MockTerminal(() => {});
     assert.isUndefined(term.joiner);
     ligatureSupport.enableLigatures(term as any);
     assert.isFunction(term.joiner);
@@ -72,14 +72,14 @@ describe('LigaturesAddon', () => {
     term.options.fontFamily = 'Nonexistant Font, monospace';
     assert.deepEqual(term.joiner!(input), []);
     await delay(500);
-    assert.isTrue(onRefresh.notCalled);
+    assert.strictEqual(onRefresh.callCount, 0);
   });
 
   it('returns nothing if the font is not present on the system', async () => {
     term.options.fontFamily = 'notinstalled';
     assert.deepEqual(term.joiner!(input), []);
     await delay(500);
-    assert.isTrue(onRefresh.notCalled);
+    assert.strictEqual(onRefresh.callCount, 0);
     assert.deepEqual(term.joiner!(input), []);
   });
 
@@ -87,7 +87,7 @@ describe('LigaturesAddon', () => {
     term.options.fontFamily = 'monospace';
     assert.deepEqual(term.joiner!(input), []);
     await delay(500);
-    assert.isTrue(onRefresh.notCalled);
+    assert.strictEqual(onRefresh.callCount, 0);
     assert.deepEqual(term.joiner!(input), []);
   });
 
@@ -95,7 +95,7 @@ describe('LigaturesAddon', () => {
     term.options.fontFamily = '';
     assert.deepEqual(term.joiner!(input), []);
     await delay(500);
-    assert.isTrue(onRefresh.notCalled);
+    assert.strictEqual(onRefresh.callCount, 0);
     assert.deepEqual(term.joiner!(input), []);
   });
 
@@ -103,7 +103,7 @@ describe('LigaturesAddon', () => {
     term.options.fontFamily = {} as any;
     assert.deepEqual(term.joiner!(input), []);
     await delay(500);
-    assert.isTrue(onRefresh.notCalled);
+    assert.strictEqual(onRefresh.callCount, 0);
   });
 });