feat: 🎸 bugfix and add test

Author: zWingz

.gitignore

@@ -7,3 +7,4 @@ package-lock.json
 data.json
 lib/develop.ts
 dev
+coverage

index.ts

@@ -16,7 +16,6 @@ function initOcto (ctx: picgo) {
     throw new Error("Can't find github-plus config")
   }
   const ins = getIns(options)
-  ins.authenticate()
   return ins
 }
 
@@ -150,7 +149,6 @@ async function onRemove (files: ImgType[]) {
   if (rms.length === 0) return
   const self: picgo = this
   const ins = initOcto(self)
-  ins.authenticate()
   const fail = []
   for (let i = 0; i < rms.length; i++) {
     const each = rms[i]

lib/helper.ts

@@ -1,5 +1,8 @@
 import dayjs from 'dayjs'
 import { ImgType, ImgZipType } from './interface'
+import slash from 'normalize-path'
+import { join } from 'path'
+
 export function getNow () {
   return dayjs().format('YYYY-MM-DD hh:mm:ss')
 }
@@ -30,3 +33,7 @@ export function unzip (
     type: ''
   }
 }
+
+export function pathJoin (...arg) {
+  return slash(join.apply(null, arg))
+}

lib/octokit.ts

@@ -1,24 +1,18 @@
 import Octokit from '@octokit/rest'
-import { getNow } from './helper'
+import { getNow, pathJoin } from './helper'
 import { PluginConfig, ImgType } from './interface'
 import { join } from 'path'
 import urlJoin from 'url-join'
 import { ImgInfo } from 'picgo/dist/utils/interfaces'
-import slash from 'slash'
-// export default octokit
 
-function pathJoin (...arg) {
-  return slash(join.apply(null, arg))
-}
-
-class Octo {
+export class Octo {
   owner: string = ''
   repo: string = ''
   branch: string = ''
   path: string = ''
   token: string = ''
   customUrl: string = ''
-  octokit = new Octokit()
+  octokit: Octokit = null
   constructor ({
     repo,
     branch,
@@ -34,11 +28,8 @@ class Octo {
     this.path = path
     this.token = token
     this.customUrl = customUrl
-  }
-  authenticate () {
-    this.octokit.authenticate({
-      type: 'token',
-      token: this.token
+    this.octokit = new Octokit({
+      auth: token ? `token ${token}` : undefined
     })
   }
 
@@ -66,9 +57,9 @@ class Octo {
     return { sha, tree }
   }
   async getDataJson (): Promise<{
-    lastSync: string;
-    data: any[];
-    sha?: string;
+    lastSync: string
+    data: any[]
+    sha?: string
   }> {
     const { owner, repo } = this
     const defaultRet = {
@@ -107,7 +98,6 @@ class Octo {
   }
   createDataJson (data) {
     const { owner, repo, branch, path } = this
-    console.log(pathJoin(path, 'data.json'))
     return this.octokit.repos.createFile({
       owner,
       repo,
@@ -118,6 +108,7 @@ class Octo {
     })
   }
   async upload (img: ImgInfo) {
+    /* istanbul ignore next */
     const { owner, repo, branch, path = '' } = this
     const { fileName } = img
     const d = await this.octokit.repos.createFile({
@@ -134,6 +125,7 @@ class Octo {
         sha: d.data.content.sha
       }
     }
+    /* istanbul ignore next */
     throw d
   }
   removeFile (img: ImgType) {
@@ -152,13 +144,27 @@ class Octo {
     if (customUrl) {
       return urlJoin(customUrl, path, fileName)
     }
-    return urlJoin(`https://raw.githubusercontent.com/`, owner, repo, branch, path, fileName)
+    return urlJoin(
+      `https://raw.githubusercontent.com/`,
+      owner,
+      repo,
+      branch,
+      path,
+      fileName
+    )
   }
 }
 
 let ins: Octo = null
 
 export function getIns (config: PluginConfig): Octo {
   if (ins) return ins
-  return new Octo(config)
+  ins = new Octo(config)
+  return ins
+}
+
+/* istanbul ignore next */
+export function clearIns () {
+  // just for test
+  ins = null
 }

package.json

@@ -20,6 +20,7 @@
     "build": "tsc -p .",
     "dev": "tsc -w -p .",
     "clean": "rm -rf dist",
+    "test": "jest",
     "pub": "yarn clean && yarn build && release-it",
     "changelog": "npx conventional-changelog -p angular -i CHANGELOG.md -s -r 0"
   },
@@ -31,19 +32,39 @@
   "author": "zzwing <zhengzwing@gmail.com>",
   "license": "MIT",
   "devDependencies": {
+    "@types/jest": "^24.0.11",
     "@types/node": "^10.10.1",
-    "electron": "^4.0.1",
-    "nodemon": "^1.18.9",
+    "electron": "^4.1.0",
+    "jest": "^24.5.0",
+    "nock": "^10.0.6",
     "picgo": "^1.2.1",
     "release-it": "^9.8.1",
+    "ts-jest": "^24.0.0",
     "tslint": "^5.10.0",
     "tslint-config-standard": "^7.1.0",
     "typescript": "^3.0.3"
   },
   "dependencies": {
-    "@octokit/rest": "^16.8.1",
+    "@octokit/rest": "^16.18.1",
     "dayjs": "^1.8.0",
-    "slash": "^2.0.0",
+    "normalize-path": "^3.0.0",
     "url-join": "^4.0.0"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "ts",
+      "js"
+    ],
+    "collectCoverageFrom": [
+      "lib/*.ts"
+    ],
+    "coverageDirectory": "./coverage/",
+    "collectCoverage": true,
+    "transform": {
+      "^.+\\.(ts|tsx)$": "ts-jest"
+    },
+    "testMatch": [
+      "**/test/*.test.(ts|tsx)"
+    ]
   }
 }

test/__snapshots__/helper.test.ts.snap

@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`test getNow test getNow: now 1`] = `"2019-02-22 12:10:20"`;
+
+exports[`test helper test unzip: unzip 1`] = `
+Object {
+  "extname": "filename",
+  "fileName": "filename",
+  "height": 1000,
+  "id": "fdsafdsafdsafasdf",
+  "imgUrl": "",
+  "sha": "fooiuiouiouio",
+  "type": "",
+  "width": 1000,
+}
+`;
+
+exports[`test helper test zip: zip 1`] = `
+Object {
+  "f": "filename",
+  "h": 1000,
+  "id": "fdsafdsafdsafasdf",
+  "s": "fooiuiouiouio",
+  "w": 1000,
+}
+`;

test/helper.test.ts

@@ -0,0 +1,48 @@
+import { pathJoin, zip, unzip, getNow } from '../lib/helper'
+describe('test helper', () => {
+  it('test pathJson', () => {
+    expect(pathJoin('path', 'to', 'dir')).toEqual('path/to/dir')
+    expect(pathJoin('path', '../to', 'dir')).toEqual('to/dir')
+    expect(pathJoin('path', '啦啦啦', '中文')).toEqual('path/啦啦啦/中文')
+  })
+
+  it('test zip', () => {
+    const str = zip({
+      fileName: 'filename',
+      width: 1000,
+      height: 1000,
+      id: 'fdsafdsafdsafasdf',
+      sha: 'fooiuiouiouio'
+    } as any)
+    expect(str).toMatchSnapshot('zip')
+  })
+  it('test unzip', () => {
+    const str = unzip({
+      f: 'filename',
+      w: 1000,
+      h: 1000,
+      id: 'fdsafdsafdsafasdf',
+      s: 'fooiuiouiouio'
+    } as any)
+    expect(str).toMatchSnapshot('unzip')
+  })
+})
+describe('test getNow', () => {
+  const date = global.Date
+  beforeEach(() => {
+    const mockedDate = new Date(Date.UTC(2019, 1, 21, 16, 10, 20))
+    global.Date = class extends Date {
+      constructor () {
+        super()
+        return mockedDate
+      }
+    } as any
+  })
+  afterEach(() => {
+    global.Date = date
+  })
+  it('test getNow', () => {
+    const now = getNow()
+    expect(now).toMatchSnapshot('now')
+  })
+})