pass the staged flag by cli args

danger · Feb 17, 2020 · dee1ec2 · dee1ec2
1 parent e86579c
commit dee1ec2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/source/commands/danger-local.ts b/source/commands/danger-local.ts
@@ -16,9 +16,8 @@ interface App extends SharedCLI {
 
 program
   .usage("[options]")
-  // TODO: this option
-  // .option("-s, --staging", "Just use staged changes.")
   .description("Runs danger without PR metadata, useful for git hooks.")
+  .option("-s, --staging", "Just use staged changes.")
   .option("-b, --base [branch_name]", "Use a different base branch")
 setSharedArgs(program).parse(process.argv)
 

diff --git a/source/dsl/cli-args.ts b/source/dsl/cli-args.ts
@@ -15,6 +15,8 @@ export interface CliArgs {
   dangerfile: string
   /** So you can have many danger runs in one code review */
   id: string
+  /** Use staged changes */
+  staged?: boolean
 }
 
 // NOTE: if add something new here, you need to change dslGenerator.ts
diff --git a/source/platforms/LocalGit.ts b/source/platforms/LocalGit.ts
@@ -28,7 +28,7 @@ export class LocalGit implements Platform {
     const base = this.options.base || "master"
     const head = "HEAD"
 
-    this.gitDiff = await localGetDiff(base, head)
+    this.gitDiff = await localGetDiff(base, head, this.options.staged)
     return this.gitDiff
   }
 
@@ -45,9 +45,8 @@ export class LocalGit implements Platform {
     const base = this.options.base || "master"
     const head = "HEAD"
     const diff = await this.getGitDiff()
-    const unstagedDiff = await localGetDiff(base, head, false)
     const commits: GitCommit[] = await localGetCommits(base, head)
-    const gitJSON = diffToGitJSONDSL(diff.concat(unstagedDiff), commits)
+    const gitJSON = diffToGitJSONDSL(diff, commits)
 
     const config: GitJSONToGitDSLConfig = {
       repo: process.cwd(),

diff --git a/source/platforms/git/localGetDiff.ts b/source/platforms/git/localGetDiff.ts
@@ -2,11 +2,11 @@ import { debug } from "../../debug"
 import { spawn } from "child_process"
 
 const d = debug("localGetDiff")
-const stagedDiffArgs = (base: string, head: string) => ["diff", `${base}...${head}`]
-const unstagedDiffArgas = (base: string) => ["diff", base]
-export const localGetDiff = (base: string, head: string, onlyUsedStaged: boolean = true) =>
+const useCommittedDiffArgs = (base: string, head: string) => ["diff", `${base}...${head}`]
+const useStagedChanges = (base: string) => ["diff", base]
+export const localGetDiff = (base: string, head: string, staged: boolean = false) =>
   new Promise<string>(done => {
-    const args = onlyUsedStaged ? stagedDiffArgs(base, head) : unstagedDiffArgas(base)
+    const args = staged ? useStagedChanges(base) : useCommittedDiffArgs(base, head)
     let stdout = ""
 
     const child = spawn("git", args, { env: process.env })

diff --git a/source/runner/_tests/jsonToDSL.test.ts b/source/runner/_tests/jsonToDSL.test.ts
@@ -42,7 +42,10 @@ describe("runner/jsonToDSL", () => {
 
   it("should call LocalGit with correct base", async () => {
     await jsonToDSL(dsl as DangerDSLJSONType, new FakeCI({}))
-    expect(localGetDiff).toHaveBeenLastCalledWith("develop", "HEAD")
+    expect(localGetDiff).toHaveBeenLastCalledWith("develop", "HEAD", undefined)
+    dsl.settings.cliArgs.staged = true
+    await jsonToDSL(dsl as DangerDSLJSONType, new FakeCI({}))
+    expect(localGetDiff).toHaveBeenLastCalledWith("develop", "HEAD", true)
   })
 
   it("should expose BitBucketServerAPI if `dsl.bitbucket_server` is passed in", async () => {