Skip to content

Refactor integration test DecodeJSON calls to use generic return value#37432

Merged
wxiaoguang merged 5 commits into
mainfrom
copilot/refactor-decodejson-usage
Apr 26, 2026
Merged

Refactor integration test DecodeJSON calls to use generic return value#37432
wxiaoguang merged 5 commits into
mainfrom
copilot/refactor-decodejson-usage

Conversation

Copilot AI commented Apr 26, 2026

Copy link
Copy Markdown
Contributor

Refactor all two-step decode patterns in integration tests to use the generic DecodeJSON return value directly, eliminating the intermediate variable declaration.

Pattern changes:

  • Struct types: var v T; DecodeJSON(t, resp, &v) → v := DecodeJSON(t, resp, &T{})
  • Slice/map types (non-pointer): var v []T; DecodeJSON(t, resp, &v) → v := DecodeJSON(t, resp, []T{})
  • Reuse across multiple calls: subsequent DecodeJSON(t, resp, &v) → v = DecodeJSON(t, resp, &T{})
  • Also covers new(T), make(T), and inline anonymous struct initialization variants

Downstream fixes applied where needed:

  • &apiTeam → apiTeam (already a pointer after refactor)
  • (*apiAttachment)[0] → apiAttachment[0] (slice no longer double-indirected)
  • Unused results variable replaced with blank statement call

Copilot AI and others added 2 commits April 26, 2026 12:22
@wxiaoguang
refactor: use generic DecodeJSON return value in integration tests
cf26c52 
Replace the var+DecodeJSON pattern with assignment from return value
throughout tests/integration:

- Struct types:  →
   (returns *T)
- Slice types:  →
   (returns []T)
- Map types:  →
   (returns map[K]V)

Also update all downstream usages that relied on value types, including:
- Dereference pointer returns when callbacks/return types expect values
- Remove redundant struct-literal reset lines before re-decode
- Fix assertions comparing values vs pointers

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
@wxiaoguang
Refactor var v T; DecodeJSON(t, resp, &v) to v := DecodeJSON(t, resp,…
534daef 
… &T{})

Agent-Logs-Url: https://github.com/go-gitea/gitea/sessions/5534efd1-0f99-43db-9548-eb0a379c7a13

Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 26, 2026
@wxiaoguang wxiaoguang marked this pull request as ready for review April 26, 2026 13:06
@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 Apr 26, 2026
@silverwind silverwind added type/refactoring Existing code has been cleaned up. There should be no new functionality. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Apr 26, 2026
@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 Apr 26, 2026
@wxiaoguang wxiaoguang enabled auto-merge (squash) April 26, 2026 13:27
@wxiaoguang wxiaoguang disabled auto-merge April 26, 2026 13:38
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 26, 2026
@wxiaoguang wxiaoguang enabled auto-merge (squash) April 26, 2026 14:15
@wxiaoguang wxiaoguang merged commit 2671b99 into main Apr 26, 2026
30 checks passed
@wxiaoguang wxiaoguang deleted the copilot/refactor-decodejson-usage branch April 26, 2026 14:57
@GiteaBot GiteaBot added this to the 1.27.0 milestone Apr 26, 2026
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 26, 2026
silverwind added a commit to McMichalK/gitea that referenced this pull request Apr 26, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into filter-by-file-extension
ede430b 
* origin/main: (176 commits)
  Refactor pull request view (3) (go-gitea#37439)
  Update 1.26.1 changelog in main (go-gitea#37442)
  Make GetPossibleUserByID can handle deleted user (go-gitea#37430)
  Fix fetch action redirect (go-gitea#37437)
  Refactor integration test DecodeJSON calls to use generic return value (go-gitea#37432)
  Integrate renovate bot for all dependency updates (go-gitea#37050)
  Refactor pull request view (2) (go-gitea#37428)
  Use MarkLongPolling instead of hard-coded route path (go-gitea#37427)
  Optimize CI caches (go-gitea#37387)
  Update AGENTS.md (go-gitea#37420)
  Update Nix flake (go-gitea#37425)
  [skip ci] Updated translations via Crowdin
  remove excessive quote from terraform instructions (go-gitea#37424)
  Improve testing init, clean up webhook tests (go-gitea#37412)
  Fix color regressions, add `priority` color (go-gitea#37417)
  [skip ci] Updated translations via Crowdin
  Stabilize e2e logout propagation test (go-gitea#37403)
  refactor: serve site manifest via `/assets/site-manifest.json` endpoint (go-gitea#37405)
  feat(security): set X-Content-Type-Options: nosniff by default (go-gitea#37354)
  Refactor pull request view (1) (go-gitea#37380)
  ...

# Conflicts:
#	templates/repo/diff/box.tmpl
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 27, 2026
@zjjhot
Merge branch 'main' into mainzjj
29ce2df 
* main: (33 commits)
  refactor: use named `Permission` field in `Repository` struct instead of anonymous embedding (go-gitea#37441)
  Refactor pull request view (3) (go-gitea#37439)
  Update 1.26.1 changelog in main (go-gitea#37442)
  Make GetPossibleUserByID can handle deleted user (go-gitea#37430)
  Fix fetch action redirect (go-gitea#37437)
  Refactor integration test DecodeJSON calls to use generic return value (go-gitea#37432)
  Integrate renovate bot for all dependency updates (go-gitea#37050)
  Refactor pull request view (2) (go-gitea#37428)
  Use MarkLongPolling instead of hard-coded route path (go-gitea#37427)
  Optimize CI caches (go-gitea#37387)
  Update AGENTS.md (go-gitea#37420)
  Update Nix flake (go-gitea#37425)
  [skip ci] Updated translations via Crowdin
  remove excessive quote from terraform instructions (go-gitea#37424)
  Improve testing init, clean up webhook tests (go-gitea#37412)
  Fix color regressions, add `priority` color (go-gitea#37417)
  [skip ci] Updated translations via Crowdin
  Stabilize e2e logout propagation test (go-gitea#37403)
  refactor: serve site manifest via `/assets/site-manifest.json` endpoint (go-gitea#37405)
  feat(security): set X-Content-Type-Options: nosniff by default (go-gitea#37354)
  ...
silverwind added a commit to hanism01/gitea that referenced this pull request Apr 27, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into fix/project-board-api…
bc56ecc 
…-review-feedback

* origin/main: (144 commits)
  Add API endpoint to reply to pull request review comments (go-gitea#36683)
  Add CurrentURL template variable back (go-gitea#37444)
  refactor: use named `Permission` field in `Repository` struct instead of anonymous embedding (go-gitea#37441)
  Refactor pull request view (3) (go-gitea#37439)
  Update 1.26.1 changelog in main (go-gitea#37442)
  Make GetPossibleUserByID can handle deleted user (go-gitea#37430)
  Fix fetch action redirect (go-gitea#37437)
  Refactor integration test DecodeJSON calls to use generic return value (go-gitea#37432)
  Integrate renovate bot for all dependency updates (go-gitea#37050)
  Refactor pull request view (2) (go-gitea#37428)
  Use MarkLongPolling instead of hard-coded route path (go-gitea#37427)
  Optimize CI caches (go-gitea#37387)
  Update AGENTS.md (go-gitea#37420)
  Update Nix flake (go-gitea#37425)
  [skip ci] Updated translations via Crowdin
  remove excessive quote from terraform instructions (go-gitea#37424)
  Improve testing init, clean up webhook tests (go-gitea#37412)
  Fix color regressions, add `priority` color (go-gitea#37417)
  [skip ci] Updated translations via Crowdin
  Stabilize e2e logout propagation test (go-gitea#37403)
  ...

# Conflicts:
#	models/project/column.go
#	routers/web/repo/issue_page_meta.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@silverwind silverwind silverwind approved these changes

+1 more reviewer

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@wxiaoguang wxiaoguang

Copilot code review Copilot

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/refactoring Existing code has been cleaned up. There should be no new functionality.

Projects

None yet

Milestone

1.27.0

Development

Successfully merging this pull request may close these issues.

4 participants

@silverwind @wxiaoguang @GiteaBot