Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong test usage of AppSubURL #29459

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Fix wrong test usage of AppSubURL #29459

merged 2 commits into from
Feb 29, 2024

Conversation

KN4CK3R
Copy link
Member

@KN4CK3R KN4CK3R commented Feb 27, 2024

The tests use an invalid setting.AppSubURL. The wrong behaviour disturbs other PRs like #29222 and #29427.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 27, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 27, 2024
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Feb 27, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 27, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 27, 2024
@delvh delvh changed the title Fix wrong usage of AppSubURL Fix wrong test usage of AppSubURL Feb 27, 2024
@lunny lunny added backport/v1.21 This PR should be backported to Gitea 1.21 reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Feb 27, 2024
Repo = "gogits/gogs"
AppSubURL = AppURL + Repo + "/"
AppURL = "http://localhost:3000/"
FullURL = AppURL + "gogits/gogs/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this mean?

Why "AppURL" is "http://localhost:3000/" but there is "gogits/gogs/" in FullURL?

  • If the "gogits/gogs/" is for sub URL, then it should define AppSubURL to "/gogits/gogs"
  • If the "gogits/gogs/" is for a repo like "user/repo", then it shouldn't be provided here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The repo info is in line 30+31. The localMetas is global for the following tests, so the full url is build here too. Where would you put that code?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. Maybe it could be called RepoFullURL. I have no more question now.

@wxiaoguang wxiaoguang removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 28, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 29, 2024
@lunny lunny enabled auto-merge (squash) February 29, 2024 03:14
@lunny lunny merged commit a6fd017 into go-gitea:main Feb 29, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Feb 29, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Feb 29, 2024
The tests use an invalid `setting.AppSubURL`. The wrong behaviour
disturbs other PRs like go-gitea#29222 and go-gitea#29427.
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Feb 29, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 29, 2024
* giteaofficial/main: (23 commits)
  Fix wrong test usage of `AppSubURL` (go-gitea#29459)
  Improve contrast on blame timestamp, fix double border (go-gitea#29482)
  Fix/Improve `processWindowErrorEvent` (go-gitea#29407)
  Apply compact padding to small buttons with svg icons (go-gitea#29471)
  Fix counter display number incorrectly displayed on the page (go-gitea#29448)
  Fix incorrect user location link on profile page (go-gitea#29474)
  Fix workflow trigger event bugs (go-gitea#29467)
  Fix URL calculation in clone input box (go-gitea#29470)
  Remove jQuery from the "find file" page (go-gitea#29456)
  Move generate from module to service (go-gitea#29465)
  The job should always run when `if` is `always()` (go-gitea#29464)
  Recolor dark theme to blue shade (go-gitea#29283)
  Let ctx.FormOptionalBool() return optional.Option[bool] (go-gitea#29461)
  Implement actions badge svgs (go-gitea#28102)
  Fix missed return (go-gitea#29450)
  Use tailwind instead of `gt-[wh]-` helper classes (go-gitea#29423)
  Lock issues and pulls faster (go-gitea#29436)
  Allow to change primary email before account activation (go-gitea#29412)
  Update docs about `DEFAULT_ACTIONS_URL` (go-gitea#29442)
  Only use supported sort order for "explore/users" page (go-gitea#29430)
  ...
lunny pushed a commit that referenced this pull request Feb 29, 2024
Backport #29459 by @KN4CK3R

The tests use an invalid `setting.AppSubURL`. The wrong behaviour
disturbs other PRs like #29222 and #29427.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
@KN4CK3R KN4CK3R deleted the fix-appsuburl branch February 29, 2024 06:56
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants