Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions __tests__/utils/command.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ describe('clone', () => {
}));

execCalledWith(mockExec, [
'git config \'init.defaultBranch\' master',
'git config --global \'init.defaultBranch\' master',
'git config \'user.name\' \'GitHub Actions\'',
'git config \'user.email\' \'example@example.com\'',
'git init \'.\'',
Expand All @@ -117,7 +117,7 @@ describe('clone', () => {
]);
stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
' >> stdout',
'[command]git config \'user.name\' \'GitHub Actions\'',
' >> stdout',
Expand Down Expand Up @@ -361,7 +361,7 @@ describe('getChangedFiles', () => {
});
stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand All @@ -380,7 +380,7 @@ describe('getChangedFiles', () => {
'[command]ls -la',
'::endgroup::',
'::group::Merging [origin/hello-world/test-branch] branch...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand Down Expand Up @@ -441,7 +441,7 @@ describe('getChangedFiles', () => {
});
stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand All @@ -458,7 +458,7 @@ describe('getChangedFiles', () => {
'[command]ls -la',
'::endgroup::',
'::group::Merging [origin/hello-world/test-branch] branch...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand Down Expand Up @@ -559,7 +559,7 @@ describe('getChangedFiles', () => {
});
stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand All @@ -576,7 +576,7 @@ describe('getChangedFiles', () => {
'[command]ls -la',
'::endgroup::',
'::group::Merging [origin/hello-world/test-branch] branch...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand Down Expand Up @@ -834,7 +834,7 @@ describe('resolveConflicts', () => {
}));

execCalledWith(mockExec, [
'git config \'init.defaultBranch\' master',
'git config --global \'init.defaultBranch\' master',
'git config \'user.name\' \'GitHub Actions\'',
'git config \'user.email\' \'example@example.com\'',
'git init \'.\'',
Expand Down Expand Up @@ -870,15 +870,15 @@ describe('resolveConflicts', () => {
}));

execCalledWith(mockExec, [
'git config \'init.defaultBranch\' master',
'git config --global \'init.defaultBranch\' master',
'git config \'user.name\' \'GitHub Actions\'',
'git config \'user.email\' \'example@example.com\'',
'git init \'.\'',
'git remote add origin \'https://octocat:test-token@github.com/hello/world.git\' || :',
'git fetch --no-tags origin \'refs/heads/feature/new-feature:refs/remotes/origin/feature/new-feature\' || :',
'git merge --no-edit origin/feature/new-feature || :',
`rm -rdf ${workDir}`,
'git config \'init.defaultBranch\' master',
'git config --global \'init.defaultBranch\' master',
'git config \'user.name\' \'GitHub Actions\'',
'git config \'user.email\' \'example@example.com\'',
'git init \'.\'',
Expand Down Expand Up @@ -928,15 +928,15 @@ describe('resolveConflicts', () => {
}));

execCalledWith(mockExec, [
'git config \'init.defaultBranch\' master',
'git config --global \'init.defaultBranch\' master',
'git config \'user.name\' \'GitHub Actions\'',
'git config \'user.email\' \'example@example.com\'',
'git init \'.\'',
'git remote add origin \'https://octocat:test-token@github.com/hello/world.git\' || :',
'git fetch --no-tags origin \'refs/heads/feature/new-feature:refs/remotes/origin/feature/new-feature\' || :',
'git merge --no-edit origin/feature/new-feature || :',
`rm -rdf ${workDir}`,
'git config \'init.defaultBranch\' master',
'git config --global \'init.defaultBranch\' master',
'git config \'user.name\' \'GitHub Actions\'',
'git config \'user.email\' \'example@example.com\'',
'git init \'.\'',
Expand All @@ -948,7 +948,7 @@ describe('resolveConflicts', () => {
'yarn upgrade',
'git add --all',
'git status --short -uno',
'git config \'init.defaultBranch\' master',
'git config --global \'init.defaultBranch\' master',
'git config \'user.name\' \'GitHub Actions\'',
'git config \'user.email\' \'example@example.com\'',
'git commit -qm \'commit message\'',
Expand Down
20 changes: 10 additions & 10 deletions __tests__/utils/process1.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ describe('execute', () => {
stdoutCalledWith(mockStdout, [
'::group::Target PullRequest Ref [change/new-topic1]',
'> Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' test-actor',
'[command]git config \'user.email\' \'test-actor@users.noreply.github.com\'',
'[command]git remote add origin',
Expand All @@ -129,7 +129,7 @@ describe('execute', () => {
'[command]git merge --no-edit origin/change/new-topic1',
'[command]ls -la',
'> Merging [origin/master] branch...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' test-actor',
'[command]git config \'user.email\' \'test-actor@users.noreply.github.com\'',
'[command]git remote add origin',
Expand Down Expand Up @@ -199,7 +199,7 @@ describe('execute', () => {

stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand Down Expand Up @@ -228,7 +228,7 @@ describe('execute', () => {
'::group::Checking diff...',
'[command]git add --all',
'[command]git status --short -uno',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'::endgroup::',
Expand Down Expand Up @@ -284,7 +284,7 @@ describe('execute', () => {

stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
' >> stdout',
'[command]git config \'user.name\' \'GitHub Actions\'',
' >> stdout',
Expand Down Expand Up @@ -439,7 +439,7 @@ describe('execute', () => {
stdoutCalledWith(mockStdout, [
'::group::Target PullRequest Ref [change/new-topic1]',
'> Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand All @@ -453,7 +453,7 @@ describe('execute', () => {
'[command]git merge --no-edit origin/change/new-topic1',
'[command]ls -la',
'> Merging [origin/master] branch...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'[command]git remote add origin',
Expand All @@ -463,7 +463,7 @@ describe('execute', () => {
'> Checking diff...',
'[command]git add --all',
'[command]git status --short -uno',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' \'GitHub Actions\'',
'[command]git config \'user.email\' \'example@example.com\'',
'> Committing...',
Expand Down Expand Up @@ -647,7 +647,7 @@ describe('execute', () => {

stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
' >> stdout',
'[command]git config \'user.name\' \'GitHub Actions\'',
' >> stdout',
Expand Down Expand Up @@ -725,7 +725,7 @@ describe('execute', () => {

stdoutCalledWith(mockStdout, [
'::group::Fetching...',
'[command]git config \'init.defaultBranch\' master',
'[command]git config --global \'init.defaultBranch\' master',
'[command]git config \'user.name\' test-actor',
'[command]git config \'user.email\' \'test-actor@users.noreply.github.com\'',
'[command]git remote add origin',
Expand Down
Loading