Merge pull request #158 from technote-space/feature/#154

feat: add base option

Author: technote-space

__tests__/utils/command.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-magic-numbers */
 import nock from 'nock';
-import path, { resolve } from 'path';
+import path, {resolve} from 'path';
 import {
   generateContext,
   testEnv,
@@ -12,8 +12,8 @@ import {
   disableNetConnect,
   getApiFixture,
 } from '@technote-space/github-action-test-helper';
-import { Logger } from '@technote-space/github-action-log-helper';
-import { getGitDiff, getFileDiff, getDiffFiles, sumResults } from '../../src/utils/command';
+import {Logger} from '@technote-space/github-action-log-helper';
+import {getGitDiff, getFileDiff, getDiffFiles, sumResults} from '../../src/utils/command';
 
 const rootDir           = path.resolve(__dirname, '../..');
 const fixtureRootDir    = resolve(__dirname, '..', 'fixtures');
@@ -415,6 +415,45 @@ describe('getGitDiff', () => {
     ]);
   });
 
+  it('should get git diff (push, not found pr with base setting)', async() => {
+    process.env.GITHUB_WORKSPACE   = '/home/runner/work/my-repo-name/my-repo-name';
+    process.env.INPUT_GITHUB_TOKEN = 'test token';
+    process.env.INPUT_BASE         = 'main';
+
+    const mockExec = spyOnSpawn();
+    setChildProcessParams({
+      stdout: (command: string): string => {
+        if (command.startsWith('git diff')) {
+          return 'package.json\nabc/composer.json\nREADME.md\nsrc/main.ts';
+        }
+        return '';
+      },
+    });
+
+    nock('https://api.github.com')
+      .persist()
+      .get('/repos/hello/world/pulls?head=hello%3Atest')
+      .reply(200, () => []);
+
+    expect(await getGitDiff(logger, Object.assign({}, pushContext, {
+      ref: 'refs/heads/test',
+    }))).toEqual([
+      {file: 'package.json', ...emptyDiff},
+      {file: 'abc/composer.json', ...emptyDiff},
+      {file: 'README.md', ...emptyDiff},
+      {file: 'src/main.ts', ...emptyDiff},
+    ]);
+    execCalledWith(mockExec, [
+      'git remote add get-diff-action \'https://octocat:test [email protected]/hello/world.git\' || :',
+      'git fetch --no-tags --no-recurse-submodules \'--depth=10000\' get-diff-action \'refs/heads/test:refs/remotes/get-diff-action/test\' || :',
+      'git diff \'main...after-sha\' \'--diff-filter=AMRC\' --name-only || :',
+      'git diff \'main...after-sha\' --shortstat -w -- \'package.json\'',
+      'git diff \'main...after-sha\' --shortstat -w -- \'abc/composer.json\'',
+      'git diff \'main...after-sha\' --shortstat -w -- \'README.md\'',
+      'git diff \'main...after-sha\' --shortstat -w -- \'src/main.ts\'',
+    ]);
+  });
+
   it('should get git diff (push tag)', async() => {
     process.env.GITHUB_WORKSPACE   = '/home/runner/work/my-repo-name/my-repo-name';
     process.env.INPUT_GITHUB_TOKEN = 'test token';

action.yml

@@ -14,6 +14,9 @@ inputs:
     description: Dot.
     default: '...'
     required: true
+  BASE:
+    description: base
+    required: false
   DIFF_FILTER:
     description: Diff filter.
     default: 'AMRC'

src/utils/misc.ts

@@ -21,6 +21,8 @@ export const getDiffInfoForPR = (pull: PullRequestParams, context: Context): Dif
 
 export const isDefaultBranch = async(octokit: Octokit, context: Context): Promise<boolean> => await (new ApiHelper(octokit, context)).getDefaultBranch() === Utils.getBranch(context);
 
+const getBase = (context: Context): string => getInput('BASE') || context.payload.before;
+
 export const getDiffInfoForPush = async(octokit: Octokit, context: Context): Promise<DiffInfo> => {
   if (Utils.isTagRef(context)) {
     return {base: '', head: ''};
@@ -44,14 +46,15 @@ export const getDiffInfoForPush = async(octokit: Octokit, context: Context): Pro
   }
 
   if (/^0+$/.test(context.payload.before)) {
+    // new branch
     return {
       base: Utils.normalizeRef(await (new ApiHelper(octokit, context)).getDefaultBranch()),
       head: context.payload.after,
     };
   }
 
   return {
-    base: context.payload.before,
+    base: getBase(context),
     head: context.payload.after,
   };
 };