From d8aa46419f9abec5a6e03ff0fb95a6c6d8b607c1 Mon Sep 17 00:00:00 2001 From: GreyPlane <709327148@qq.com> Date: Tue, 7 May 2024 15:57:37 +0800 Subject: [PATCH 1/2] fix: add missing withPrefix to targetRefName --- .../org/scalasteward/core/forge/azurerepos/JsonCodec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/scala/org/scalasteward/core/forge/azurerepos/JsonCodec.scala b/modules/core/src/main/scala/org/scalasteward/core/forge/azurerepos/JsonCodec.scala index 8be29111d8..91539d9bd8 100644 --- a/modules/core/src/main/scala/org/scalasteward/core/forge/azurerepos/JsonCodec.scala +++ b/modules/core/src/main/scala/org/scalasteward/core/forge/azurerepos/JsonCodec.scala @@ -38,7 +38,7 @@ private[azurerepos] object PullRequestPayload { def from(data: NewPullRequestData): PullRequestPayload = PullRequestPayload( sourceRefName = withPrefix(data.head), - targetRefName = data.base.name, + targetRefName = withPrefix(data.base.name), title = data.title, labels = Option.when(data.labels.nonEmpty)(data.labels), description = data.body From 9b47e523cb581adfea34fa88edd30acbdebb2254 Mon Sep 17 00:00:00 2001 From: GreyPlane <709327148@qq.com> Date: Tue, 7 May 2024 16:08:45 +0800 Subject: [PATCH 2/2] fix: make test consistent on targetRefName --- .../core/forge/azurerepos/AzureReposApiAlgTest.scala | 2 +- .../scalasteward/core/forge/azurerepos/JsonCodecTest.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/AzureReposApiAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/AzureReposApiAlgTest.scala index c30d67fde7..5b486f164f 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/AzureReposApiAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/AzureReposApiAlgTest.scala @@ -209,7 +209,7 @@ class AzureReposApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] { title = "Update cats-effect to 3.3.14", body = "Updates org.typelevel:cats-effect from 3.3.13 to 3.3.14.", head = "refs/heads/update/cats-effect-3.3.14", - base = Branch("refs/heads/main"), + base = Branch("main"), labels = List.empty, assignees = List.empty, reviewers = List.empty diff --git a/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/JsonCodecTest.scala b/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/JsonCodecTest.scala index 07ae4ee6fc..8c39f59f9b 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/JsonCodecTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/forge/azurerepos/JsonCodecTest.scala @@ -24,7 +24,7 @@ class JsonCodecTest extends FunSuite { val expected = json"""{ "sourceRefName" : "refs/heads/source", - "targetRefName" : "main", + "targetRefName" : "refs/heads/main", "title" : "Test MR title", "labels" : null, "description" : "Test MR body" @@ -38,7 +38,7 @@ class JsonCodecTest extends FunSuite { val expected = json"""{ "sourceRefName" : "refs/heads/source", - "targetRefName" : "main", + "targetRefName" : "refs/heads/main", "title" : "Test MR title", "labels" : [ "foo", "bar" ], "description" : "Test MR body"