diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..3b726e5 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.4 +f7ff32694ee0f9cc59e0b9d33c1f9274be7034d8 diff --git a/.scalafmt.conf b/.scalafmt.conf index b026ca5..b2dfb15 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.4 preset = IntelliJ runner.dialect = scala212 diff --git a/zio/src/test/scala/io/github/kijuky/zio/jira/FakeIssueRestClient.scala b/zio/src/test/scala/io/github/kijuky/zio/jira/FakeIssueRestClient.scala index f495a6b..16da3c3 100644 --- a/zio/src/test/scala/io/github/kijuky/zio/jira/FakeIssueRestClient.scala +++ b/zio/src/test/scala/io/github/kijuky/zio/jira/FakeIssueRestClient.scala @@ -20,17 +20,12 @@ case class FakeIssueRestClient( doGetCreateIssueMetadata: GetCreateIssueMetadataOptions => Seq[CimProject] = null, doCreateIssues: Seq[IssueInput] => BulkOperationResult[BasicIssue] = null, - doGetCreateIssueMetaProjectIssueTypes: ( - String, - Long, - Int - ) => Page[IssueType] = null, - doGetCreateIssueMetaFields: ( - String, - String, - Long, - Int - ) => Page[CimFieldInfo] = null, + doGetCreateIssueMetaProjectIssueTypes: (String, Long, Int) => Page[ + IssueType + ] = null, + doGetCreateIssueMetaFields: (String, String, Long, Int) => Page[ + CimFieldInfo + ] = null, doGetIssue: String => Issue = null, doGetIssueDetail: (String, Seq[Expandos]) => Issue = null, doDeleteIssue: (String, Boolean) => Unit = null, diff --git a/zio/src/test/scala/io/github/kijuky/zio/jira/JiraIssueRepoImplSpec.scala b/zio/src/test/scala/io/github/kijuky/zio/jira/JiraIssueRepoImplSpec.scala index a0b62b8..27e983a 100644 --- a/zio/src/test/scala/io/github/kijuky/zio/jira/JiraIssueRepoImplSpec.scala +++ b/zio/src/test/scala/io/github/kijuky/zio/jira/JiraIssueRepoImplSpec.scala @@ -13,8 +13,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: Seq(issue) = actual yield Chunk(test("課題を返すこと"): assertTrue: - issue.summary == "Fake Issue" - ) + issue.summary == "Fake Issue") .provide(ZLayer: val issues = Seq(FakeIssue(summary = "Fake Issue")) val searchClient = FakeSearchRestClient( @@ -23,8 +22,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: ) val restClient = FakeJiraRestClient(searchClient = searchClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suite("searchJqlが課題を返さなかった場合"): for @@ -32,8 +30,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: actual <- sut.list(123456) yield Chunk(test("課題を返さないこと"): assertTrue: - actual.isEmpty - ) + actual.isEmpty) .provide(ZLayer: val searchClient = FakeSearchRestClient( doGetFilterId = _ => FakeFilter(), @@ -41,8 +38,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: ) val restClient = FakeJiraRestClient(searchClient = searchClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suite("searchJqlでエラーが発生した場合"): for @@ -50,8 +46,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: isFailure <- sut.list(123456).isFailure yield Chunk(test("失敗すること"): assertTrue: - isFailure - ) + isFailure) .provide(ZLayer: val searchClient = FakeSearchRestClient( doGetFilterId = _ => FakeFilter(), @@ -59,8 +54,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: ) val restClient = FakeJiraRestClient(searchClient = searchClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suite("getFilterでエラーが発生した場合"): for @@ -68,15 +62,13 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: isFailure <- sut.list(123456).isFailure yield Chunk(test("失敗すること"): assertTrue: - isFailure - ) + isFailure) .provide(ZLayer: val searchClient = FakeSearchRestClient(doGetFilterId = _ => throw RuntimeException()) val restClient = FakeJiraRestClient(searchClient = searchClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suiteAll("list(jql)"): suite("searchJqlが課題を返した場合"): @@ -86,8 +78,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: Seq(issue) = actual yield Chunk(test("課題を返すこと"): assertTrue: - issue.summary == "Fake Issue" - ) + issue.summary == "Fake Issue") .provide(ZLayer: val issues = Seq(FakeIssue(summary = "Fake Issue")) val searchClient = FakeSearchRestClient(doSearchJql = @@ -95,8 +86,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: ) val restClient = FakeJiraRestClient(searchClient = searchClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suite("searchJqlが課題を返さなかった場合"): for @@ -104,8 +94,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: actual <- sut.list("filterId = 123456") yield Chunk(test("課題を返さないこと"): assertTrue: - actual.isEmpty - ) + actual.isEmpty) .provide(ZLayer: val searchClient = FakeSearchRestClient(doSearchJql = @@ -113,8 +102,7 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: ) val restClient = FakeJiraRestClient(searchClient = searchClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suite("searchJqlでエラーが発生した場合"): for @@ -122,15 +110,13 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: isFailure <- sut.list(123456).isFailure yield Chunk(test("失敗すること"): assertTrue: - isFailure - ) + isFailure) .provide(ZLayer: val searchClient = FakeSearchRestClient(doSearchJql = _ => throw RuntimeException()) val restClient = FakeJiraRestClient(searchClient = searchClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suiteAll("save"): suite("updateIssueが正常終了した場合"): @@ -141,14 +127,12 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: .isSuccess yield Chunk(test("正常終了すること"): assertTrue: - isSuccess - ) + isSuccess) .provide(ZLayer: val issueClient = FakeIssueRestClient(doUpdateIssue = (_, _) => ()) val restClient = FakeJiraRestClient(issueClient = issueClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suite("updateIssueが異常終了した場合"): for @@ -158,16 +142,14 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: .isFailure yield Chunk(test("異常終了すること"): assertTrue: - isFailure - ) + isFailure) .provide(ZLayer: val issueClient = FakeIssueRestClient(doUpdateIssue = (_, _) => throw RuntimeException() ) val restClient = FakeJiraRestClient(issueClient = issueClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suiteAll("transition"): suite("transitionが正常終了した場合"): @@ -176,14 +158,12 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: isSuccess <- sut.transition(FakeJiraIssue(), 123).isSuccess yield Chunk(test("正常終了すること"): assertTrue: - isSuccess - ) + isSuccess) .provide(ZLayer: val issueClient = FakeIssueRestClient(doTransitionIssue = (_, _) => ()) val restClient = FakeJiraRestClient(issueClient = issueClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) suite("transitionが異常終了した場合"): for @@ -191,13 +171,11 @@ object JiraIssueRepoImplSpec extends ZIOSpecDefault: isFailure <- sut.transition(FakeJiraIssue(), 123).isFailure yield Chunk(test("異常終了すること"): assertTrue: - isFailure - ) + isFailure) .provide(ZLayer: val issueClient = FakeIssueRestClient(doTransitionIssue = (_, _) => throw RuntimeException() ) val restClient = FakeJiraRestClient(issueClient = issueClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraIssueRepoImpl(service) - ) + yield JiraIssueRepoImpl(service)) diff --git a/zio/src/test/scala/io/github/kijuky/zio/jira/JiraUserRepoImplSpec.scala b/zio/src/test/scala/io/github/kijuky/zio/jira/JiraUserRepoImplSpec.scala index c269c95..20f901f 100644 --- a/zio/src/test/scala/io/github/kijuky/zio/jira/JiraUserRepoImplSpec.scala +++ b/zio/src/test/scala/io/github/kijuky/zio/jira/JiraUserRepoImplSpec.scala @@ -13,15 +13,13 @@ object JiraUserRepoImplSpec extends ZIOSpecDefault: Some(user) = actual: @unchecked yield Chunk(test("ユーザーを返すこと"): assertTrue: - user.name == "test-user" - ) + user.name == "test-user") .provide(ZLayer: val userClient = FakeUserRestClient(doGetUser = _ => FakeUser(name = "test-user")) val restClient = FakeJiraRestClient(userClient = userClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraUserRepoImpl(service) - ) + yield JiraUserRepoImpl(service)) suite("getUserがエラーになった場合"): for @@ -29,12 +27,10 @@ object JiraUserRepoImplSpec extends ZIOSpecDefault: isFailure <- sut.findByName("test-user").isFailure yield Chunk(test("失敗すること"): assertTrue: - isFailure - ) + isFailure) .provide(ZLayer: val userClient = FakeUserRestClient(doGetUser = _ => throw RuntimeException()) val restClient = FakeJiraRestClient(userClient = userClient) for service <- ZIO.succeed(FakeJiraService(restClient = restClient)) - yield JiraUserRepoImpl(service) - ) + yield JiraUserRepoImpl(service))