Rename the to

danger · Feb 18, 2020 · c99655a · c99655a
1 parent 08be748
commit c99655a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/source/commands/danger-local.ts b/source/commands/danger-local.ts
@@ -24,7 +24,7 @@ setSharedArgs(program).parse(process.argv)
 const app = (program as any) as App
 const base = app.base || "master"
 
-const localPlatform = new LocalGit({ base, staged: app.staging })
+const localPlatform = new LocalGit({ base, staging: app.staging })
 localPlatform.validateThereAreChanges().then(changes => {
   if (changes) {
     const fakeSource = new FakeCI(process.env)

diff --git a/source/dsl/cli-args.ts b/source/dsl/cli-args.ts
@@ -16,7 +16,7 @@ export interface CliArgs {
   /** So you can have many danger runs in one code review */
   id: string
   /** Use staged changes */
-  staged?: boolean
+  staging?: 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
@@ -10,7 +10,7 @@ import { readFileSync } from "fs"
 
 export interface LocalGitOptions {
   base?: string
-  staged?: boolean
+  staging?: boolean
 }
 
 export class LocalGit implements Platform {
@@ -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.options.staged)
+    this.gitDiff = await localGetDiff(base, head, this.options.staging)
     return this.gitDiff
   }
 

diff --git a/source/platforms/git/localGetDiff.ts b/source/platforms/git/localGetDiff.ts
@@ -3,10 +3,10 @@ import { spawn } from "child_process"
 
 const d = debug("localGetDiff")
 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) =>
+const useStagingChanges = (base: string) => ["diff", base]
+export const localGetDiff = (base: string, head: string, staging: boolean = false) =>
   new Promise<string>(done => {
-    const args = staged ? useStagedChanges(base) : useCommittedDiffArgs(base, head)
+    const args = staging ? useStagingChanges(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
@@ -43,7 +43,7 @@ describe("runner/jsonToDSL", () => {
   it("should call LocalGit with correct base", async () => {
     await jsonToDSL(dsl as DangerDSLJSONType, new FakeCI({}))
     expect(localGetDiff).toHaveBeenLastCalledWith("develop", "HEAD", undefined)
-    dsl.settings.cliArgs.staged = true
+    dsl.settings.cliArgs.staging = true
     await jsonToDSL(dsl as DangerDSLJSONType, new FakeCI({}))
     expect(localGetDiff).toHaveBeenLastCalledWith("develop", "HEAD", true)
   })