isomorphic-git
diff --git a/‎__tests__/test-hosting-providers.js
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎__tests__/test-hosting-providers.js
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎__tests__/test-push.js
Copy file name to clipboard
+214-44Lines changed: 214 additions & 44 deletions b/‎__tests__/test-push.js
Copy file name to clipboard
+214-44Lines changed: 214 additions & 44 deletions
@@ -151,7 +151,8 @@ describe('Hosting Providers', () => {
     // with "public_repo" access. The only repo it has write access to is
     // https://github.com/isomorphic-git/test.empty
     // It is stored reversed to avoid Github's auto-revoking feature.
-    const token = reverse('e8df25b340c98b7eec57a4976bd9074b93a7dc1c')
+    const password = reverse('e8df25b340c98b7eec57a4976bd9074b93a7dc1c')
+    const username = 'isomorphic-git-test-push'
     it('fetch', async () => {
       // Setup
       const { fs, gitdir } = await makeFixture('test-hosting-providers')
@@ -163,7 +164,7 @@ describe('Hosting Providers', () => {
         corsProxy: process.browser ? `https://${localhost}:9999` : undefined,
         remote: 'github',
         ref: 'master',
-        onAuth: () => ({ token }),
+        onAuth: () => ({ username, password }),
       })
       expect(res).toBeTruthy()
       expect(res.defaultBranch).toBe('refs/heads/test')
@@ -181,7 +182,7 @@ describe('Hosting Providers', () => {
         remote: 'github',
         ref: 'master',
         force: true,
-        onAuth: () => ({ token }),
+        onAuth: () => ({ username, password }),
       })
       expect(res).toBeTruthy()
       expect(res.ok).toBe(true)
 
@@ -269,6 +269,7 @@ describe('push', () => {
     }
     expect(error).toContain('401')
   })
+
   it('onAuthSuccess', async () => {
     // Setup
     const { fs, gitdir } = await makeFixture('test-push')
@@ -279,50 +280,49 @@ describe('push', () => {
       value: `https://${localhost}:8888/test-push-server-auth.git`,
     })
     // Test
-    let fillCalled = false
-    let approvedCalled = false
-    let rejectedCalled = false
-    let onAuthArgs = null
-    let onAuthSuccessArgs = null
-    let onAuthFailureArgs = null
+    const onAuthArgs = []
+    const onAuthSuccessArgs = []
+    const onAuthFailureArgs = []
     await push({
       fs,
       http,
       gitdir,
       remote: 'auth',
       ref: 'master',
       async onAuth(...args) {
-        fillCalled = true
-        onAuthArgs = args
+        onAuthArgs.push(args)
         return {
           username: 'testuser',
           password: 'testpassword',
         }
       },
       async onAuthSuccess(...args) {
-        approvedCalled = true
-        onAuthSuccessArgs = args
+        onAuthSuccessArgs.push(args)
       },
       async onAuthFailure(...args) {
-        rejectedCalled = true
-        onAuthFailureArgs = args
+        onAuthFailureArgs.push(args)
       },
     })
-    expect(fillCalled).toBe(true)
-    expect(approvedCalled).toBe(true)
-    expect(rejectedCalled).toBe(false)
     expect(onAuthArgs).toEqual([
-      `https://${localhost}:8888/test-push-server-auth.git`,
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {},
+        },
+      ],
     ])
     expect(onAuthSuccessArgs).toEqual([
-      `https://${localhost}:8888/test-push-server-auth.git`,
-      {
-        username: 'testuser',
-        password: 'testpassword',
-      },
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          username: 'testuser',
+          password: 'testpassword',
+        },
+      ],
     ])
-    expect(onAuthFailureArgs).toBeNull()
+    expect(onAuthFailureArgs).toEqual([])
   })
+
   it('onAuthFailure', async () => {
     // Setup
     const { fs, gitdir } = await makeFixture('test-push')
@@ -333,14 +333,10 @@ describe('push', () => {
       value: `https://${localhost}:8888/test-push-server-auth.git`,
     })
     // Test
-    let fillCalled = false
-    let approvedCalled = false
-    let rejectedCalled = false
     let err
-    let onAuthArgs = null
-    let onAuthSuccessArgs = null
-    let onAuthFailureArgs = null
-
+    const onAuthArgs = []
+    const onAuthSuccessArgs = []
+    const onAuthFailureArgs = []
     try {
       await push({
         fs,
@@ -349,40 +345,214 @@ describe('push', () => {
         remote: 'auth',
         ref: 'master',
         async onAuth(...args) {
-          fillCalled = true
-          onAuthArgs = args
+          onAuthArgs.push(args)
           return {
             username: 'testuser',
             password: 'NoT_rIgHt',
           }
         },
         async onAuthSuccess(...args) {
-          approvedCalled = true
-          onAuthSuccessArgs = args
+          onAuthSuccessArgs.push(args)
         },
         async onAuthFailure(...args) {
-          rejectedCalled = true
-          onAuthFailureArgs = args
+          onAuthFailureArgs.push(args)
+          switch (onAuthFailureArgs.length) {
+            case 1:
+              return {
+                username: 'testuser',
+                password: 'St1ll_NoT_rIgHt',
+              }
+            case 2:
+              return {
+                headers: {
+                  Authorization: 'Bearer Big Bear',
+                  'X-Authorization': 'supersecret',
+                },
+              }
+          }
         },
       })
     } catch (e) {
       err = e
     }
     expect(err).toBeDefined()
     expect(err.code).toBe(E.HTTPError)
-    expect(fillCalled).toBe(true)
-    expect(approvedCalled).toBe(false)
-    expect(rejectedCalled).toBe(true)
     expect(onAuthArgs).toEqual([
-      `https://${localhost}:8888/test-push-server-auth.git`,
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {},
+        },
+      ],
     ])
-    expect(onAuthSuccessArgs).toBeNull()
+    expect(onAuthSuccessArgs).toEqual([])
     expect(onAuthFailureArgs).toEqual([
-      `https://${localhost}:8888/test-push-server-auth.git`,
-      {
-        username: 'testuser',
-        password: 'NoT_rIgHt',
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {
+            Authorization: 'Basic dGVzdHVzZXI6Tm9UX3JJZ0h0',
+          },
+          username: 'testuser',
+          password: 'NoT_rIgHt',
+        },
+      ],
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {
+            Authorization: 'Basic dGVzdHVzZXI6U3QxbGxfTm9UX3JJZ0h0',
+          },
+          username: 'testuser',
+          password: 'St1ll_NoT_rIgHt',
+        },
+      ],
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {
+            Authorization: 'Bearer Big Bear',
+            'X-Authorization': 'supersecret',
+          },
+        },
+      ],
+    ])
+  })
+
+  it('onAuthFailure then onAuthSuccess', async () => {
+    // Setup
+    const { fs, gitdir } = await makeFixture('test-push')
+    await setConfig({
+      fs,
+      gitdir,
+      path: 'remote.auth.url',
+      value: `https://${localhost}:8888/test-push-server-auth.git`,
+    })
+    // Test
+    const onAuthArgs = []
+    const onAuthSuccessArgs = []
+    const onAuthFailureArgs = []
+    await push({
+      fs,
+      http,
+      gitdir,
+      remote: 'auth',
+      ref: 'master',
+      async onAuth(...args) {
+        onAuthArgs.push(args)
+        return {
+          username: 'testuser',
+          password: 'NoT_rIgHt',
+        }
+      },
+      async onAuthSuccess(...args) {
+        onAuthSuccessArgs.push(args)
       },
+      async onAuthFailure(...args) {
+        onAuthFailureArgs.push(args)
+        switch (onAuthFailureArgs.length) {
+          case 1:
+            return {
+              username: 'testuser',
+              password: 'St1ll_NoT_rIgHt',
+            }
+          case 2:
+            return {
+              username: 'testuser',
+              password: 'testpassword',
+            }
+        }
+      },
+    })
+    expect(onAuthArgs).toEqual([
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {},
+        },
+      ],
+    ])
+    expect(onAuthSuccessArgs).toEqual([
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          username: 'testuser',
+          password: 'testpassword',
+        },
+      ],
+    ])
+    expect(onAuthFailureArgs).toEqual([
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {
+            Authorization: 'Basic dGVzdHVzZXI6Tm9UX3JJZ0h0',
+          },
+          username: 'testuser',
+          password: 'NoT_rIgHt',
+        },
+      ],
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {
+            Authorization: 'Basic dGVzdHVzZXI6U3QxbGxfTm9UX3JJZ0h0',
+          },
+          username: 'testuser',
+          password: 'St1ll_NoT_rIgHt',
+        },
+      ],
+    ])
+  })
+
+  it('onAuth + cancel', async () => {
+    // Setup
+    const { fs, gitdir } = await makeFixture('test-push')
+    await setConfig({
+      fs,
+      gitdir,
+      path: 'remote.auth.url',
+      value: `https://${localhost}:8888/test-push-server-auth.git`,
+    })
+    // Test
+    let err
+    const onAuthArgs = []
+    const onAuthSuccessArgs = []
+    const onAuthFailureArgs = []
+    try {
+      await push({
+        fs,
+        http,
+        gitdir,
+        remote: 'auth',
+        ref: 'master',
+        async onAuth(...args) {
+          onAuthArgs.push(args)
+          return {
+            cancel: true,
+          }
+        },
+        async onAuthSuccess(...args) {
+          onAuthSuccessArgs.push(args)
+        },
+        async onAuthFailure(...args) {
+          onAuthFailureArgs.push(args)
+        },
+      })
+    } catch (e) {
+      err = e
+    }
+    expect(err).toBeDefined()
+    expect(err.code).toBe(E.UserCancelledError)
+    expect(onAuthArgs).toEqual([
+      [
+        `https://${localhost}:8888/test-push-server-auth.git`,
+        {
+          headers: {},
+        },
+      ],
     ])
+    expect(onAuthSuccessArgs).toEqual([])
+    expect(onAuthFailureArgs).toEqual([])
   })
 })