Fix test coverage

ddamato · Jun 26, 2020 · c39b048 · c39b048
1 parent 20758ef
commit c39b048
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/src/createSymbols.js b/src/createSymbols.js
@@ -18,12 +18,12 @@ export default async function createSymbols(pathOrObject) {
       const files = await fs.promises.readdir(pathOrObject);
       const sources = await Promise.all(files.map(async (file) => {
         const filepath = path.resolve(pathOrObject, file);
-        if (!fs.statSync(filepath).isFile()) {
+        const { name, ext } = path.parse(file);
+        if (!ext || ext !== '.svg') {
           return;
         }
-        const fileName = path.parse(file).name;
         const source = await fs.promises.readFile(filepath);
-        return { [fileName]: source.toString() };
+        return { [name]: source.toString() };
       }))
       const flattened = sources.filter(Boolean).reduce(( acc, source ) => Object.assign(acc, source), {});
       return createSymbols(flattened);

diff --git a/test/src/createSymbols.test.js b/test/src/createSymbols.test.js
@@ -16,34 +16,40 @@ describe('createSymbols', function () {
     expect(symbols.x).to.be.a('string');
   });
 
-  it('should throw if it cannot read given directory', function (done) {
-    createSymbols(path.resolve(__dirname, 'undefined')).then(done).catch((err) => {
+  it('should throw if it cannot read given directory', async function () {
+    try {
+      await createSymbols(path.resolve(__dirname, 'undefined'));
+    } catch (err) {
       expect(err).to.exist;
-      done();
-    });
+    }
   });
 
-  it('should process a given object as svg strings', function (done) {
+  it('should throw if no symbols are in directory', async function () {
+    try {
+      await createSymbols(path.resolve(__dirname, 'fixtures', 'none'));
+    } catch (err) {
+      expect(err).to.exist;
+    }
+  });
+
+  it('should process a given object as svg strings', async function () {
     const x = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path/></svg>';
-    createSymbols({ x }).then((symbols) => {
-      expect(symbols.x).to.be.a('string');
-      done();
-    }).catch(done);
+    const symbols = await createSymbols({ x })
+    expect(symbols.x).to.be.a('string');
   });
 
-  it('should include complex collection of shapes', function (done) {
+  it('should include complex collection of shapes', async function () {
     const x = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path/><polygon/><circle/></svg>';
-    createSymbols({ x }).then((symbols) => {
-      expect(symbols.x).to.include('<path/><polygon/><circle/>');
-      done();
-    }).catch(done);
+    const symbols = await createSymbols({ x });
+    expect(symbols.x).to.include('<path/><polygon/><circle/>');
   });
 
-  it('should throw if incorrect parameter is provided', function (done) {
-    createSymbols(42).then(done).catch((err) => {
+  it('should throw if incorrect parameter is provided', async function () {
+    try {
+      await createSymbols(42);
+    } catch (err) {
       expect(err).to.exist;
-      done();
-    })
+    }
   });
 
   describe('browser context', function() {
@@ -60,11 +66,12 @@ describe('createSymbols', function () {
       jsdom();
     });
 
-    it('should throw if reading path in browser context', function(done) {
-      createSymbols(path.resolve(__dirname, 'fixtures')).then(done).catch((err) => {
+    it('should throw if reading path in browser context', async function() {
+      try {
+        await createSymbols(path.resolve(__dirname, 'fixtures'));
+      } catch (err) {
         expect(err).to.exist;
-        done();
-      }).catch(done);
+      }
     });
   });
 });