chore: fix tests

Signed-off-by: Marco Crivellaro <marco.crive@gmail.com>

plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts

@@ -18,20 +18,20 @@ import { TemplateAction } from '../../types';
 
 jest.mock('../helpers');
 
-import { createPublishGithubAction } from './github';
+import { getVoidLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
 import {
-  ScmIntegrations,
   DefaultGithubCredentialsProvider,
   GithubCredentialsProvider,
+  ScmIntegrations,
 } from '@backstage/integration';
-import { ConfigReader } from '@backstage/config';
-import { getVoidLogger } from '@backstage/backend-common';
+import { when } from 'jest-when';
 import { PassThrough } from 'stream';
 import {
   enableBranchProtectionOnDefaultRepoBranch,
   initRepoAndPush,
 } from '../helpers';
-import { when } from 'jest-when';
+import { createPublishGithubAction } from './github';
 
 const mockOctokit = {
   rest: {
@@ -609,7 +609,7 @@ describe('publish:github', () => {
 
     mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
       data: {
-        name: 'repository',
+        name: 'repo',
       },
     });
 
@@ -618,7 +618,7 @@ describe('publish:github', () => {
     expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
       owner: 'owner',
       client: mockOctokit,
-      repoName: 'repository',
+      repoName: 'repo',
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
@@ -636,7 +636,7 @@ describe('publish:github', () => {
     expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
       owner: 'owner',
       client: mockOctokit,
-      repoName: 'repository',
+      repoName: 'repo',
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: true,
@@ -654,7 +654,7 @@ describe('publish:github', () => {
     expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
       owner: 'owner',
       client: mockOctokit,
-      repoName: 'repository',
+      repoName: 'repo',
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
@@ -669,7 +669,7 @@ describe('publish:github', () => {
 
     mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
       data: {
-        name: 'repository',
+        name: 'repo',
       },
     });
 
@@ -678,7 +678,7 @@ describe('publish:github', () => {
     expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
       owner: 'owner',
       client: mockOctokit,
-      repoName: 'repository',
+      repoName: 'repo',
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
@@ -696,7 +696,7 @@ describe('publish:github', () => {
     expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
       owner: 'owner',
       client: mockOctokit,
-      repoName: 'repository',
+      repoName: 'repo',
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
@@ -714,7 +714,7 @@ describe('publish:github', () => {
     expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
       owner: 'owner',
       client: mockOctokit,
-      repoName: 'repository',
+      repoName: 'repo',
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
@@ -729,7 +729,7 @@ describe('publish:github', () => {
 
     mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
       data: {
-        name: 'repository',
+        name: 'repo',
       },
     });
 

plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts

@@ -169,49 +169,6 @@ export function createPublishGithubAction(options: {
       const remoteUrl = newRepo.clone_url;
       const repoContentsUrl = `${newRepo.html_url}/blob/${defaultBranch}`;
 
-      // const gitAuthorInfo = {
-      //   name: gitAuthorName
-      //     ? gitAuthorName
-      //     : config.getOptionalString('scaffolder.defaultAuthor.name'),
-      //   email: gitAuthorEmail
-      //     ? gitAuthorEmail
-      //     : config.getOptionalString('scaffolder.defaultAuthor.email'),
-      // };
-
-      // await initRepoAndPush({
-      //   dir: getRepoSourceDirectory(ctx.workspacePath, ctx.input.sourcePath),
-      //   remoteUrl,
-      //   defaultBranch,
-      //   auth: {
-      //     username: 'x-access-token',
-      //     password: octokitOptions.auth,
-      //   },
-      //   logger: ctx.logger,
-      //   commitMessage: gitCommitMessage
-      //     ? gitCommitMessage
-      //     : config.getOptionalString('scaffolder.defaultCommitMessage'),
-      //   gitAuthorInfo,
-      // });
-
-      // if (protectDefaultBranch) {
-      //   try {
-      //     await enableBranchProtectionOnDefaultRepoBranch({
-      //       owner,
-      //       client,
-      //       repoName: newRepo.name,
-      //       logger: ctx.logger,
-      //       defaultBranch,
-      //       requireCodeOwnerReviews,
-      //       requiredStatusCheckContexts,
-      //     });
-      //   } catch (e) {
-      //     assertError(e);
-      //     ctx.logger.warn(
-      //       `Skipping: default branch protection on '${newRepo.name}', ${e.message}`,
-      //     );
-      //   }
-      // }
-
       await initRepoPushAndProtect(
         remoteUrl,
         octokitOptions.auth,