From dec17ba704b72460836c04306020cdc219d8245b Mon Sep 17 00:00:00 2001 From: Julian Schlarb Date: Sun, 1 Jun 2025 17:06:25 +0200 Subject: [PATCH] fix: camel and pascal case transformer (#8034) Fixes: #7853 ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/.md` to be be used for the release notes instead of the title. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8034 Reviewed-by: Earl Warren Co-authored-by: Julian Schlarb Co-committed-by: Julian Schlarb --- services/repository/generate.go | 8 ++------ services/repository/generate_test.go | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/services/repository/generate.go b/services/repository/generate.go index 9aeb057c3d..e23e294de1 100644 --- a/services/repository/generate.go +++ b/services/repository/generate.go @@ -43,12 +43,8 @@ type expansion struct { var defaultTransformers = []transformer{ {Name: "SNAKE", Transform: xstrings.ToSnakeCase}, {Name: "KEBAB", Transform: xstrings.ToKebabCase}, - // as of xstrings v1.5.0 the CAMEL & PASCAL workarounds are no longer necessary - // and can be removed https://codeberg.org/forgejo/forgejo/pulls/4050 - {Name: "CAMEL", Transform: func(str string) string { - return xstrings.FirstRuneToLower(xstrings.ToCamelCase(str)) - }}, - {Name: "PASCAL", Transform: xstrings.ToCamelCase}, + {Name: "CAMEL", Transform: xstrings.ToCamelCase}, + {Name: "PASCAL", Transform: xstrings.ToPascalCase}, {Name: "LOWER", Transform: strings.ToLower}, {Name: "UPPER", Transform: strings.ToUpper}, {Name: "TITLE", Transform: util.ToTitleCase}, diff --git a/services/repository/generate_test.go b/services/repository/generate_test.go index b0f97d0ffb..2eb3a55e96 100644 --- a/services/repository/generate_test.go +++ b/services/repository/generate_test.go @@ -65,3 +65,30 @@ func TestFileNameSanitize(t *testing.T) { assert.Equal(t, "_", fileNameSanitize("\u0000")) assert.Equal(t, "目标", fileNameSanitize("目标")) } + +func TestTransformers(t *testing.T) { + input := "Foo_Forgejo-BAR" + + tests := []struct { + name string + expected string + }{ + {"SNAKE", "foo_forgejo_bar"}, + {"KEBAB", "foo-forgejo-bar"}, + {"CAMEL", "fooForgejoBar"}, + {"PASCAL", "FooForgejoBar"}, + {"LOWER", "foo_forgejo-bar"}, + {"UPPER", "FOO_FORGEJO-BAR"}, + {"TITLE", "Foo_forgejo-Bar"}, + } + + for i, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tranform := defaultTransformers[i] + assert.Equal(t, tt.name, tranform.Name) + + got := tranform.Transform(input) + assert.Equal(t, tt.expected, got) + }) + } +}