From f145a0458b8030c98e4b896c1d6a274eaec1287d Mon Sep 17 00:00:00 2001
From: Tavi Nolan <Tavi.Nolan@fmr.com>
Date: Wed, 17 Apr 2024 15:48:51 +0100
Subject: [PATCH] Fixed test imports, added changeset

Signed-off-by: Tavi Nolan <Tavi.Nolan@fmr.com>
---
 .changeset/cyan-paws-beg.md                   |  5 +++++
 .../src/actions/github.test.ts                |  1 -
 .../src/actions/githubPullRequest.test.ts     | 19 +++++++++----------
 .../src/actions/githubPullRequest.ts          |  2 +-
 .../src/actions/githubRepoCreate.test.ts      |  1 -
 .../src/actions/githubWebhook.test.ts         |  7 +++----
 6 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/cyan-paws-beg.md

diff --git a/.changeset/cyan-paws-beg.md b/.changeset/cyan-paws-beg.md
new file mode 100644
index 0000000000..87c2b746a4
--- /dev/null
+++ b/.changeset/cyan-paws-beg.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-github': patch
+---
+
+Added handling for dry run to githubPullRequest and githubWebhook and added tests for this functionality
diff --git a/plugins/scaffolder-backend-module-github/src/actions/github.test.ts b/plugins/scaffolder-backend-module-github/src/actions/github.test.ts
index 58c43616e4..9eda9a2eb0 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/github.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/github.test.ts
@@ -41,7 +41,6 @@ import {
   GithubCredentialsProvider,
   ScmIntegrations,
 } from '@backstage/integration';
-import { when } from 'jest-when';
 import { createPublishGithubAction } from './github';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
 import {
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.test.ts b/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.test.ts
index 150ed39e50..613ebc7c59 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.test.ts
@@ -14,21 +14,20 @@
  * limitations under the License.
  */
 
-import {
-  ActionContext,
-  TemplateAction,
-} from '@backstage/plugin-scaffolder-node';
+import { createRootLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
 import {
   GithubCredentialsProvider,
   ScmIntegrations,
 } from '@backstage/integration';
-
-import { ConfigReader } from '@backstage/config';
-import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
-import { createMockDirectory } from '@backstage/backend-test-utils';
-import { createPublishGithubPullRequestAction } from './githubPullRequest';
-import { createRootLogger } from '@backstage/backend-common';
+import {
+  ActionContext,
+  TemplateAction,
+} from '@backstage/plugin-scaffolder-node';
 import fs from 'fs-extra';
+import { createPublishGithubPullRequestAction } from './githubPullRequest';
+import { createMockDirectory } from '@backstage/backend-test-utils';
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 
 // Make sure root logger is initialized ahead of FS mock
 createRootLogger();
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts b/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts
index de70f56399..ce199d5f56 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts
@@ -26,7 +26,7 @@ import {
   serializeDirectoryContents,
 } from '@backstage/plugin-scaffolder-node';
 import { Octokit } from 'octokit';
-import { CustomErrorBase, InputError } from '@backstage/errors';
+import { InputError, CustomErrorBase } from '@backstage/errors';
 import { resolveSafeChildPath } from '@backstage/backend-common';
 import { createPullRequest } from 'octokit-plugin-create-pull-request';
 import { getOctokitOptions } from './helpers';
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts b/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts
index df2dd29eb8..1750acdb9a 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts
@@ -30,7 +30,6 @@ import {
   GithubCredentialsProvider,
   ScmIntegrations,
 } from '@backstage/integration';
-import { when } from 'jest-when';
 import { createGithubRepoCreateAction } from './githubRepoCreate';
 import { entityRefToName } from './gitHelpers';
 
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.test.ts b/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.test.ts
index 6c0335c509..30bdcef20d 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.test.ts
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
+import { createGithubWebhookAction } from './githubWebhook';
 import {
+  ScmIntegrations,
   DefaultGithubCredentialsProvider,
   GithubCredentialsProvider,
-  ScmIntegrations,
 } from '@backstage/integration';
-
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { TemplateAction } from '@backstage/plugin-scaffolder-node';
-import { createGithubWebhookAction } from './githubWebhook';
-import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 
 const mockOctokit = {
   rest: {