From 65691af8c1db8541206091bcf3278dd7867fb82a Mon Sep 17 00:00:00 2001
From: James Ives <iam@jamesiv.es>
Date: Sat, 17 Oct 2020 12:23:52 -0400
Subject: [PATCH] Additional 3.7.0 tests

---
 __tests__/git.test.ts | 60 +++++++++++++++++++++++++++++++++++--------
 src/git.ts            |  4 ---
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts
index 699db276..baf84d9a 100644
--- a/__tests__/git.test.ts
+++ b/__tests__/git.test.ts
@@ -211,6 +211,7 @@ describe('git', () => {
       Object.assign(action, {
         silent: false,
         folder: 'assets',
+        folderPath: 'assets',
         branch: 'branch',
         gitHubToken: '123',
         lfs: true,
@@ -230,26 +231,33 @@ describe('git', () => {
       expect(response).toBe(Status.SUCCESS)
     })
 
-    it('should not ignore CNAME or nojekyll if they exist in the deployment folder', async () => {
+    it('should appropriately move along if git stash errors', async () => {
+      ;(execute as jest.Mock).mockImplementation(cmd => {
+        if (cmd === 'git stash apply') {
+          // Mocks the case where git stash apply errors.
+          throw new Error()
+        }
+      })
+
       Object.assign(action, {
         silent: false,
         folder: 'assets',
+        folderPath: 'assets',
         branch: 'branch',
         gitHubToken: '123',
+        lfs: true,
+        preserve: true,
+        isTest: true,
         pusher: {
           name: 'asd',
           email: 'as@cat'
-        },
-        clean: true
+        }
       })
 
       const response = await deploy(action)
 
-      fs.createWriteStream('assets/.nojekyll')
-      fs.createWriteStream('assets/CNAME')
-
       // Includes the call to generateBranch
-      expect(execute).toBeCalledTimes(12)
+      expect(execute).toBeCalledTimes(14)
       expect(rmRF).toBeCalledTimes(1)
       expect(response).toBe(Status.SUCCESS)
     })
@@ -257,14 +265,16 @@ describe('git', () => {
     it('should execute commands with single commit toggled', async () => {
       Object.assign(action, {
         silent: false,
-        folder: 'assets',
+        folder: 'other',
+        folderPath: 'other',
         branch: 'branch',
         gitHubToken: '123',
         singleCommit: true,
         pusher: {
           name: 'asd',
           email: 'as@cat'
-        }
+        },
+        clean: true
       })
 
       await deploy(action)
@@ -274,11 +284,37 @@ describe('git', () => {
       expect(rmRF).toBeCalledTimes(1)
     })
 
+    it('should not ignore CNAME or nojekyll if they exist in the deployment folder', async () => {
+      Object.assign(action, {
+        silent: false,
+        folder: 'assets',
+        folderPath: 'assets',
+        branch: 'branch',
+        gitHubToken: '123',
+        pusher: {
+          name: 'asd',
+          email: 'as@cat'
+        },
+        clean: true
+      })
+
+      fs.createWriteStream('assets/.nojekyll')
+      fs.createWriteStream('assets/CNAME')
+
+      const response = await deploy(action)
+
+      // Includes the call to generateBranch
+      expect(execute).toBeCalledTimes(12)
+      expect(rmRF).toBeCalledTimes(1)
+      expect(response).toBe(Status.SUCCESS)
+    })
+
     it('should execute commands with clean options, ommits sha commit message', async () => {
       process.env.GITHUB_SHA = ''
       Object.assign(action, {
         silent: false,
-        folder: 'assets',
+        folder: 'other',
+        folderPath: 'other',
         branch: 'branch',
         gitHubToken: '123',
         pusher: {
@@ -286,7 +322,8 @@ describe('git', () => {
           email: 'as@cat'
         },
         clean: true,
-        cleanExclude: '["cat", "montezuma"]'
+        cleanExclude: '["cat", "montezuma"]',
+        workspace: 'other'
       })
 
       await deploy(action)
@@ -300,6 +337,7 @@ describe('git', () => {
       Object.assign(action, {
         silent: false,
         folder: 'assets',
+        folderPath: 'assets',
         branch: 'branch',
         gitHubToken: '123',
         pusher: {
diff --git a/src/git.ts b/src/git.ts
index 13a7344a..2c421274 100644
--- a/src/git.ts
+++ b/src/git.ts
@@ -173,10 +173,6 @@ export async function deploy(action: ActionInterface): Promise<Status> {
 
       try {
         await execute(`git stash apply`, action.workspace, action.silent)
-
-        if (action.isTest) {
-          throw new Error()
-        }
       } catch {
         info('Unable to apply from stash, continuing…')
       }