fail function use and removing unnecessary variable

fail function to fail test with proper error make code more concise
DXHeroes · Oct 6, 2020 · febdf71 · febdf71
1 parent 1fdbdd4
commit febdf71
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 35 deletions.
diff --git a/src/services/FileSystemService.real.spec.ts b/src/services/FileSystemService.real.spec.ts
@@ -366,15 +366,13 @@ describe('FileSystemService - REAL', () => {
 
         const files: string[] = [];
 
-        let response = true;
         await fileSystemService
           .flatTraverse(mockFolderPath, (meta) => {
             files.push(meta.name);
             return false;
           })
-          .catch((e) => (response = e));
-
-        expect(response).toEqual(false);
+          .then(() => fail("promise didn't fail on false return"))
+          .catch((e) => expect(e).toBe(false));
       });
 
       it("throws an error if the root doesn't exist", async () => {

diff --git a/src/services/FileSystemService.virtual.spec.ts b/src/services/FileSystemService.virtual.spec.ts
@@ -373,15 +373,13 @@ describe('FileSystemService - VIRTUAL', () => {
 
         const files: string[] = [];
 
-        let response = true;
         await service
           .flatTraverse(mockFolderPath, (meta) => {
             files.push(meta.name);
             return false;
           })
-          .catch((e) => (response = e));
-
-        expect(response).toEqual(false);
+          .then(() => fail("promise didn't fail on false return"))
+          .catch((e) => expect(e).toBe(false));
       });
 
       it("throws an error if the root doesn't exist", async () => {

diff --git a/src/services/git/Git.spec.ts b/src/services/git/Git.spec.ts
@@ -224,38 +224,35 @@ describe('Git', () => {
   });
 
   describe('#flatTraverse', () => {
-    it('returns keys of metadata of all results', async () => {
-      gitHubNock.getDirectory('mockFolder', ['mockFile.ts'], ['mockSubFolder']);
-      gitHubNock.getFile('mockFolder/mockFile.ts');
-      gitHubNock.getDirectory('mockFolder/mockSubFolder', ['mockSubFolderFile.txt'], []);
-      gitHubNock.getFile('mockFolder/mockSubFolder/mockSubFolderFile.txt');
-
-      const files: string[] = [];
-
-      await git.flatTraverse('mockFolder', (meta) => {
-        files.push(meta.name);
+    describe('#fetch dir and files', () => {
+      beforeEach(() => {
+        gitHubNock.getDirectory('mockFolder', ['mockFile.ts'], ['mockSubFolder']);
+        gitHubNock.getFile('mockFolder/mockFile.ts');
+        gitHubNock.getDirectory('mockFolder/mockSubFolder', ['mockSubFolderFile.txt'], []);
+        gitHubNock.getFile('mockFolder/mockSubFolder/mockSubFolderFile.txt');
       });
 
-      expect(files.length).toEqual(3);
-      expect(files).toContain('mockFile.ts');
-      expect(files).toContain('mockSubFolder');
-      expect(files).toContain('mockSubFolderFile.txt');
-    });
+      it('returns keys of metadata of all results', async () => {
+        const files: string[] = [];
 
-    it('stops on false', async () => {
-      gitHubNock.getDirectory('mockFolder', ['mockFile.ts'], ['mockSubFolder']);
-      gitHubNock.getFile('mockFolder/mockFile.ts');
-      gitHubNock.getDirectory('mockFolder/mockSubFolder', ['mockSubFolderFile.txt'], []);
-      gitHubNock.getFile('mockFolder/mockSubFolder/mockSubFolderFile.txt');
+        await git.flatTraverse('mockFolder', (meta) => {
+          files.push(meta.name);
+        });
 
-      let response = true;
-      await git
-        .flatTraverse('mockFolder', () => {
-          return false;
-        })
-        .catch((e) => (response = e));
+        expect(files.length).toEqual(3);
+        expect(files).toContain('mockFile.ts');
+        expect(files).toContain('mockSubFolder');
+        expect(files).toContain('mockSubFolderFile.txt');
+      });
 
-      expect(response).toEqual(false);
+      it('stops on false', async () => {
+        await git
+          .flatTraverse('mockFolder', () => {
+            return false;
+          })
+          .then(() => fail("promise didn't fail"))
+          .catch((e) => expect(e).toBe(false));
+      });
     });
 
     it("throws an error if the root doesn't exist", async () => {