Merge pull request #34 from NotNinja/assert

Replace chai with assert
neocotic · Feb 5, 2018 · 946db45 · 946db45
2 parents 384f279 + 03946dd
commit 946db45
Show file tree

Hide file tree

Showing 13 changed files with 121 additions and 94 deletions.
diff --git a/packages/convert-svg-core/package.json b/packages/convert-svg-core/package.json
@@ -37,8 +37,6 @@
     "tmp": "0.0.33"
   },
   "devDependencies": {
-    "chai": "^4.1.2",
-    "chai-as-promised": "^7.1.1",
     "mocha": "^5.0.0",
     "sinon": "^4.2.2"
   },

diff --git a/packages/convert-svg-core/test/API.spec.js b/packages/convert-svg-core/test/API.spec.js
@@ -22,7 +22,7 @@
 
 'use strict';
 
-const { expect } = require('chai');
+const assert = require('assert');
 const sinon = require('sinon');
 
 const API = require('../src/API');
@@ -50,26 +50,28 @@ describe('[convert-svg-core] API', () => {
     it('should return Converter instance using provider', () => {
       const converter = api.createConverter();
 
-      expect(converter).to.be.an.instanceOf(Converter);
-      expect(converter.provider).to.equal(provider);
+      assert.ok(converter instanceof Converter);
+      assert.strictEqual(converter.provider, provider);
     });
 
     it('should never return same instance', () => {
-      expect(api.createConverter()).to.not.equal(api.createConverter());
+      assert.notStrictEqual(api.createConverter(), api.createConverter());
     });
   });
 
   describe('#provider', () => {
     it('should return provider', () => {
-      expect(api.provider).to.equal(provider);
+      assert.strictEqual(api.provider, provider);
     });
   });
 
   describe('#version', () => {
     it('should return provider version', () => {
-      provider.getVersion.returns('0.0.0');
+      const version = '0.0.0';
 
-      expect(api.version).to.equal('0.0.0');
+      provider.getVersion.returns(version);
+
+      assert.equal(api.version, version);
     });
   });
 });
diff --git a/packages/convert-svg-core/test/CLI.spec.js b/packages/convert-svg-core/test/CLI.spec.js
@@ -22,7 +22,7 @@
 
 'use strict';
 
-const { expect } = require('chai');
+const assert = require('assert');
 const { EOL } = require('os');
 const sinon = require('sinon');
 const { Writable } = require('stream');
@@ -54,19 +54,23 @@ describe('[convert-svg-core] CLI', () => {
     it('should write message to error stream', () => {
       cli.error('foo');
 
-      expect(outputStream.write.callCount).to.equal(0);
-      expect(errorStream.write.callCount).to.equal(1);
-      expect(errorStream.write.args[0]).to.deep.equal([ `foo${EOL}` ]);
+      assert.equal(outputStream.write.callCount, 0);
+      assert.equal(errorStream.write.callCount, 1);
+      assert.deepEqual(errorStream.write.args, [
+        [ `foo${EOL}` ]
+      ]);
     });
   });
 
   describe('#output', () => {
     it('should write message to output stream', () => {
       cli.output('foo');
 
-      expect(errorStream.write.callCount).to.equal(0);
-      expect(outputStream.write.callCount).to.equal(1);
-      expect(outputStream.write.args[0]).to.deep.equal([ `foo${EOL}` ]);
+      assert.equal(errorStream.write.callCount, 0);
+      assert.equal(outputStream.write.callCount, 1);
+      assert.deepEqual(outputStream.write.args, [
+        [ `foo${EOL}` ]
+      ]);
     });
   });
 
@@ -76,7 +80,7 @@ describe('[convert-svg-core] CLI', () => {
 
   describe('#provider', () => {
     it('should return provider', () => {
-      expect(cli.provider).to.equal(provider);
+      assert.strictEqual(cli.provider, provider);
     });
   });
 });
diff --git a/packages/convert-svg-core/test/Converter.spec.js b/packages/convert-svg-core/test/Converter.spec.js
@@ -22,17 +22,12 @@
 
 'use strict';
 
-const chai = require('chai');
-const chaiAsPromised = require('chai-as-promised');
+const assert = require('assert');
 const sinon = require('sinon');
 
 const Converter = require('../src/Converter');
 const Provider = require('../src/Provider');
 
-chai.use(chaiAsPromised);
-
-const { expect } = chai;
-
 describe('[convert-svg-core] Converter', () => {
   let converter;
   let provider;
@@ -53,8 +48,13 @@ describe('[convert-svg-core] Converter', () => {
       it('should thrown an error', async() => {
         await converter.destroy();
 
-        await expect(converter.convert('<svg></svg>')).to.eventually.be.rejectedWith(Error,
-          'Converter has been destroyed. A new Converter must be created');
+        try {
+          await converter.convert('<svg></svg>');
+          // Should have thrown
+          assert.fail();
+        } catch (e) {
+          assert.equal(e.message, 'Converter has been destroyed. A new Converter must be created');
+        }
       });
     });
   });
@@ -66,35 +66,40 @@ describe('[convert-svg-core] Converter', () => {
       it('should thrown an error', async() => {
         await converter.destroy();
 
-        await expect(converter.convertFile('foo.svg')).to.eventually.be.rejectedWith(Error,
-          'Converter has been destroyed. A new Converter must be created');
+        try {
+          await converter.convertFile('foo.svg');
+          // Should have thrown
+          assert.fail();
+        } catch (e) {
+          assert.equal(e.message, 'Converter has been destroyed. A new Converter must be created');
+        }
       });
     });
   });
 
   describe('#destroy', () => {
     it('should destroy the converter', async() => {
-      expect(converter.destroyed).to.equal(false);
+      assert.equal(converter.destroyed, false);
 
       await converter.destroy();
 
-      expect(converter.destroyed).to.equal(true);
+      assert.equal(converter.destroyed, true);
     });
   });
 
   describe('#destroyed', () => {
     it('should indicate whether converter has been destroyed', async() => {
-      expect(converter.destroyed).to.equal(false);
+      assert.equal(converter.destroyed, false);
 
       await converter.destroy();
 
-      expect(converter.destroyed).to.equal(true);
+      assert.equal(converter.destroyed, true);
     });
   });
 
   describe('#provider', () => {
     it('should return provider', () => {
-      expect(converter.provider).to.equal(provider);
+      assert.strictEqual(converter.provider, provider);
     });
   });
 });
diff --git a/packages/convert-svg-core/test/Provider.spec.js b/packages/convert-svg-core/test/Provider.spec.js
@@ -22,7 +22,7 @@
 
 'use strict';
 
-const { expect } = require('chai');
+const assert = require('assert');
 
 const Provider = require('../src/Provider');
 
@@ -53,8 +53,12 @@ describe('[convert-svg-core] Provider', () => {
       it('should throw an error by default', () => {
         const provider = new Provider();
 
-        expect(() => provider[methodName]()).to.throw(Error,
-          `Provider#${methodName} abstract method is not implemented`);
+        assert.throws(() => {
+          provider[methodName]();
+        }, (error) => {
+          return error instanceof Error &&
+              error.message === `Provider#${methodName} abstract method is not implemented`;
+        });
       });
     });
   });
@@ -63,15 +67,15 @@ describe('[convert-svg-core] Provider', () => {
     it('should return Provider#getType transformed into lower case by default', () => {
       const provider = new TestProviderImpl();
 
-      expect(provider.getExtension()).to.equal('type');
+      assert.equal(provider.getExtension(), 'type');
     });
   });
 
   describe('#getFormat', () => {
     it('should return Provider#getType transformed into upper case by default', () => {
       const provider = new TestProviderImpl();
 
-      expect(provider.getFormat()).to.equal('TYPE');
+      assert.equal(provider.getFormat(), 'TYPE');
     });
   });
 });
diff --git a/packages/convert-svg-core/test/index.spec.js b/packages/convert-svg-core/test/index.spec.js
@@ -22,7 +22,7 @@
 
 'use strict';
 
-const { expect } = require('chai');
+const assert = require('assert');
 
 const API = require('../src/API');
 const CLI = require('../src/CLI');
@@ -33,25 +33,25 @@ const Provider = require('../src/Provider');
 describe('[convert-svg-core] index', () => {
   describe('.API', () => {
     it('should be a reference to API constructor', () => {
-      expect(index.API).to.equal(API, 'Must be API constructor');
+      assert.strictEqual(index.API, API, 'Must be API constructor');
     });
   });
 
   describe('.CLI', () => {
     it('should be a reference to CLI constructor', () => {
-      expect(index.CLI).to.equal(CLI, 'Must be CLI constructor');
+      assert.strictEqual(index.CLI, CLI, 'Must be CLI constructor');
     });
   });
 
   describe('.Converter', () => {
     it('should be a reference to Converter constructor', () => {
-      expect(index.Converter).to.equal(Converter, 'Must be Converter constructor');
+      assert.strictEqual(index.Converter, Converter, 'Must be Converter constructor');
     });
   });
 
   describe('.Provider', () => {
     it('should be a reference to Provider constructor', () => {
-      expect(index.Provider).to.equal(Provider, 'Must be Provider constructor');
+      assert.strictEqual(index.Provider, Provider, 'Must be Provider constructor');
     });
   });
 });
diff --git a/packages/convert-svg-test-helper/package.json b/packages/convert-svg-test-helper/package.json
@@ -27,8 +27,6 @@
     "url": "https://github.com/NotNinja/convert-svg.git"
   },
   "dependencies": {
-    "chai": "^4.1.2",
-    "chai-as-promised": "^7.1.1",
     "file-url": "^2.0.2",
     "lodash.clonedeep": "^4.5.0",
     "mocha": "^5.0.0",

diff --git a/packages/convert-svg-test-helper/src/Helper.js b/packages/convert-svg-test-helper/src/Helper.js
@@ -22,8 +22,7 @@
 
 'use strict';
 
-const chai = require('chai');
-const chaiAsPromised = require('chai-as-promised');
+const assert = require('assert');
 const cloneDeep = require('lodash.clonedeep');
 const fileUrl = require('file-url');
 const fs = require('fs');
@@ -34,9 +33,6 @@ const util = require('util');
 
 const coreTests = require('./tests.json');
 
-chai.use(chaiAsPromised);
-
-const { expect } = chai;
 const makeDirectory = util.promisify(fs.mkdir);
 const readFile = util.promisify(fs.readFile);
 const removeFile = util.promisify(rimraf);
@@ -167,8 +163,8 @@ class Helper {
       });
 
       afterEach(() => {
-        expect(api.createConverter.callCount).to.equal(1);
-        expect(converter.destroy.callCount).to.equal(1);
+        assert.equal(api.createConverter.callCount, 1);
+        assert.equal(converter.destroy.callCount, 1);
       });
 
       afterEach(() => {
@@ -214,13 +210,19 @@ class Helper {
           const method = testAPI ? api.convertFile.bind(api) : converter.convertFile.bind(converter);
 
           if (test.error) {
-            await expect(method(inputFilePath, options)).to.eventually.be.rejectedWith(Error, test.error);
+            try {
+              await method(inputFilePath, options);
+              // Should have thrown
+              assert.fail();
+            } catch (e) {
+              assert.equal(e.message, test.error);
+            }
           } else {
             const actualFilePath = await method(inputFilePath, options);
             const actual = await readFile(outputFilePath);
 
-            expect(actualFilePath).to.equal(outputFilePath);
-            expect(actual).to.deep.equal(expected);
+            assert.equal(actualFilePath, outputFilePath);
+            assert.deepEqual(actual, expected);
           }
         });
       });
@@ -252,8 +254,8 @@ class Helper {
       });
 
       afterEach(() => {
-        expect(api.createConverter.callCount).to.equal(1);
-        expect(converter.destroy.callCount).to.equal(1);
+        assert.equal(api.createConverter.callCount, 1);
+        assert.equal(converter.destroy.callCount, 1);
       });
 
       afterEach(() => {
@@ -299,11 +301,17 @@ class Helper {
           const method = testAPI ? api.convert.bind(api) : converter.convert.bind(converter);
 
           if (test.error) {
-            await expect(method(input, options)).to.eventually.be.rejectedWith(Error, test.error);
+            try {
+              await method(input, options);
+              // Should have thrown
+              assert.fail();
+            } catch (e) {
+              assert.equal(e.message, test.error);
+            }
           } else {
             const actual = await method(input, options);
 
-            expect(actual).to.deep.equal(expected);
+            assert.deepEqual(actual, expected);
           }
         });
       });
@@ -333,7 +341,7 @@ class Helper {
         const method = testAPI ? api.convert.bind(api) : converter.convert.bind(converter);
         const actual = await method(input);
 
-        expect(actual).to.deep.equal(expected);
+        assert.deepEqual(actual, expected);
       });
     });
   }

diff --git a/packages/convert-svg-to-jpeg/package.json b/packages/convert-svg-to-jpeg/package.json
@@ -29,7 +29,6 @@
     "convert-svg-core": "^0.3.3"
   },
   "devDependencies": {
-    "chai": "^4.1.2",
     "convert-svg-test-helper": "^0.3.3",
     "mocha": "^5.0.0"
   },

diff --git a/packages/convert-svg-to-jpeg/test/.eslintrc.json b/packages/convert-svg-to-jpeg/test/.eslintrc.json
@@ -4,6 +4,7 @@
     "mocha": true
   },
   "rules": {
+    "no-undefined": "off",
     "no-unused-expressions": "off"
   }
 }