mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-07 23:27:41 +00:00
Some checks failed
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
Integration tests for the release process / release-simulation (push) Has been cancelled
urfave/cli v2 will eventually become unmaintained, switch over to v3 which is the latest supported version. Note: the `docs` command would be a lot of work to restore with v3 ([the package is still in alpha](https://github.com/urfave/cli-docs)) An alternative to avoid a breaking change would be to not upgrade from v2 to v3 for that reason alone. Note: these commits were cherry-picked from https://code.forgejo.org/forgefriends/forgefriends Note: it is best reviewed side by side with no display of whitespace changes (there are a lot of those when converting vars to func). - a few functional changes were necessary and are noted in context in the file changes tab - https://cli.urfave.org/migrate-v2-to-v3/ upgrade instructions were followed in the most minimal way possible - upgrade gof3 to v3.10.8 which includes and upgrade from urfave/cli v2 to urfave/cli v3 - upgrade gitlab.com/gitlab-org/api/client-go v0.129.0 because it is an indirect dependency of gof3 and requires a change because of a deprecated field that otherwise triggers a lint error but nothing else otherwise - verified that the [script](https://codeberg.org/forgejo/docs/src/branch/next/scripts/cli-docs.sh) that generates the [CLI documentation](https://codeberg.org/forgejo/docs/src/branch/next/scripts/cli-docs.sh) still works. There are cosmetic differences and the **help** subcommand is no longer advertised (although it is still supported) but the `--help` option is advertised as expected so it is fine. - end-to-end tests [passed](https://code.forgejo.org/forgejo/end-to-end/pulls/667) (they use the Forgejo CLI to some extent) ## 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... - [ ] 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 - [ ] 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. - [x] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Breaking features - [PR](https://codeberg.org/forgejo/forgejo/pulls/8035): <!--number 8035 --><!--line 0 --><!--description VGhlIGBmb3JnZWpvIGRvY3NgIGNvbW1hbmQgaXMgZGVwcmVjYXRlZCBhbmQgQ0xJIGVycm9ycyBhcmUgbm93IGRpc3BsYXllZCBvbiBzdGRlcnIgaW5zdGVhZCBvZiBzdGRvdXQuIFRoZXNlIGJyZWFraW5nIGNoYW5nZXMgaGFwcGVuZWQgYmVjYXVzZSB0aGUgcGFja2FnZSB1c2VkIHRvIHBhcnNlIHRoZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzIHdhcyBbdXBncmFkZWQgZnJvbSB2MiB0byB2M10oaHR0cHM6Ly9jbGkudXJmYXZlLm9yZy9taWdyYXRlLXYyLXRvLXYzLykuIEEgW3NlcGFyYXRlIHByb2plY3Qgd2FzIGluaXRpYXRlZF0oaHR0cHM6Ly9naXRodWIuY29tL3VyZmF2ZS9jbGktZG9jcykgdG8gcmUtaW1wbGVtZW50IHRoZSBgZG9jc2AgY29tbWFuZCwgYnV0IGl0IGlzIG5vdCB5ZXQgcHJvZHVjdGlvbiByZWFkeS4=-->The `forgejo docs` command is deprecated and CLI errors are now displayed on stderr instead of stdout. These breaking changes happened because the package used to parse the command line arguments was [upgraded from v2 to v3](https://cli.urfave.org/migrate-v2-to-v3/). A [separate project was initiated](https://github.com/urfave/cli-docs) to re-implement the `docs` command, but it is not yet production ready.<!--description--> <!--end release-notes-assistant--> Co-authored-by: limiting-factor <limiting-factor@posteo.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8035 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
150 lines
4.8 KiB
Go
150 lines
4.8 KiB
Go
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"fmt"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/models/unittest"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/tests"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func Test_Cmd_AdminUser(t *testing.T) {
|
|
onGiteaRun(t, func(*testing.T, *url.URL) {
|
|
for i, testCase := range []struct {
|
|
name string
|
|
options []string
|
|
mustChangePassword bool
|
|
}{
|
|
{
|
|
name: "default",
|
|
options: []string{},
|
|
mustChangePassword: true,
|
|
},
|
|
{
|
|
name: "--must-change-password=false",
|
|
options: []string{"--must-change-password=false"},
|
|
mustChangePassword: false,
|
|
},
|
|
{
|
|
name: "--must-change-password=true",
|
|
options: []string{"--must-change-password=true"},
|
|
mustChangePassword: true,
|
|
},
|
|
{
|
|
name: "--must-change-password",
|
|
options: []string{"--must-change-password"},
|
|
mustChangePassword: true,
|
|
},
|
|
} {
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
defer tests.PrintCurrentTest(t)()
|
|
name := fmt.Sprintf("testuser%d", i)
|
|
|
|
options := []string{"user", "create", "--username", name, "--password", "password", "--email", name + "@example.com"}
|
|
options = append(options, testCase.options...)
|
|
output, err := runMainApp("admin", options...)
|
|
require.NoError(t, err)
|
|
assert.Contains(t, output, "has been successfully created")
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name})
|
|
assert.Equal(t, testCase.mustChangePassword, user.MustChangePassword)
|
|
|
|
options = []string{"user", "change-password", "--username", name, "--password", "password"}
|
|
options = append(options, testCase.options...)
|
|
output, err = runMainApp("admin", options...)
|
|
require.NoError(t, err)
|
|
assert.Contains(t, output, "has been successfully updated")
|
|
user = unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name})
|
|
assert.Equal(t, testCase.mustChangePassword, user.MustChangePassword)
|
|
|
|
_, err = runMainApp("admin", "user", "delete", "--username", name)
|
|
require.NoError(t, err)
|
|
unittest.AssertNotExistsBean(t, &user_model.User{Name: name})
|
|
})
|
|
}
|
|
})
|
|
}
|
|
|
|
func Test_Cmd_AdminFirstUser(t *testing.T) {
|
|
onGiteaRun(t, func(*testing.T, *url.URL) {
|
|
for _, testCase := range []struct {
|
|
name string
|
|
options []string
|
|
mustChangePassword bool
|
|
isAdmin bool
|
|
}{
|
|
{
|
|
name: "default",
|
|
options: []string{},
|
|
mustChangePassword: false,
|
|
isAdmin: false,
|
|
},
|
|
{
|
|
name: "--must-change-password=false",
|
|
options: []string{"--must-change-password=false"},
|
|
mustChangePassword: false,
|
|
isAdmin: false,
|
|
},
|
|
{
|
|
name: "--must-change-password=true",
|
|
options: []string{"--must-change-password=true"},
|
|
mustChangePassword: true,
|
|
isAdmin: false,
|
|
},
|
|
{
|
|
name: "--must-change-password",
|
|
options: []string{"--must-change-password"},
|
|
mustChangePassword: true,
|
|
isAdmin: false,
|
|
},
|
|
{
|
|
name: "--admin default",
|
|
options: []string{"--admin"},
|
|
mustChangePassword: false,
|
|
isAdmin: true,
|
|
},
|
|
{
|
|
name: "--admin --must-change-password=false",
|
|
options: []string{"--admin", "--must-change-password=false"},
|
|
mustChangePassword: false,
|
|
isAdmin: true,
|
|
},
|
|
{
|
|
name: "--admin --must-change-password=true",
|
|
options: []string{"--admin", "--must-change-password=true"},
|
|
mustChangePassword: true,
|
|
isAdmin: true,
|
|
},
|
|
{
|
|
name: "--admin --must-change-password",
|
|
options: []string{"--admin", "--must-change-password"},
|
|
mustChangePassword: true,
|
|
isAdmin: true,
|
|
},
|
|
} {
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
db.GetEngine(db.DefaultContext).Exec("DELETE FROM `user`")
|
|
db.GetEngine(db.DefaultContext).Exec("DELETE FROM `email_address`")
|
|
assert.Equal(t, int64(0), user_model.CountUsers(db.DefaultContext, nil))
|
|
name := "testuser"
|
|
|
|
options := []string{"user", "create", "--username", name, "--password", "password", "--email", name + "@example.com"}
|
|
options = append(options, testCase.options...)
|
|
output, err := runMainApp("admin", options...)
|
|
require.NoError(t, err)
|
|
assert.Contains(t, output, "has been successfully created")
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name})
|
|
assert.Equal(t, testCase.mustChangePassword, user.MustChangePassword)
|
|
assert.Equal(t, testCase.isAdmin, user.IsAdmin)
|
|
})
|
|
}
|
|
})
|
|
}
|