Go-Gitea
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lint and fix wrong migrations

pull/30205/head
Lunny Xiao 2025-10-25 16:30:27 -07:00
parent 65dbaa528c
commit ae282397be
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/migrations/migrations.go
View File

@ -25,6 +25,7 @@ import (
"code.gitea.io/gitea/models/migrations/v1_23"
"code.gitea.io/gitea/models/migrations/v1_24"
"code.gitea.io/gitea/models/migrations/v1_25"
"code.gitea.io/gitea/models/migrations/v1_26"
"code.gitea.io/gitea/models/migrations/v1_6"
"code.gitea.io/gitea/models/migrations/v1_7"
"code.gitea.io/gitea/models/migrations/v1_8"
@ -394,8 +395,10 @@ func prepareMigrationTasks() []*migration {
// Gitea 1.24.0 ends at database version 321
newMigration(321, "Use LONGTEXT for some columns and fix review_state.updated_files column", v1_25.UseLongTextInSomeColumnsAndFixBugs),
newMigration(322, "Extend comment tree_path length limit", v1_25.ExtendCommentTreePathLength),
newMigration(323, "Add support for actions concurrency", v1_25.AddActionsConcurrency),
newMigration(324, "Add new table project_workflow", v1_25.AddProjectWorkflow),
// Gitea 1.25.0 ends at database version 323
newMigration(323, "Add support for actions concurrency", v1_26.AddActionsConcurrency),
newMigration(324, "Add new table project_workflow", v1_26.AddProjectWorkflow),
}
return preparedMigrations
}

2
models/migrations/v1_25/v323.go → models/migrations/v1_26/v323.go
View File

@ -1,7 +1,7 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package v1_25
package v1_26
import (
"xorm.io/xorm"

2
models/migrations/v1_25/v324.go → models/migrations/v1_26/v324.go
View File

@ -1,7 +1,7 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package v1_25
package v1_26
import (
"code.gitea.io/gitea/modules/timeutil"

4
models/project/workflows_test.go
View File

@ -4,7 +4,7 @@
package project
import (
"fmt"
"strconv"
"testing"
"code.gitea.io/gitea/models/db"
@ -115,7 +115,7 @@ func TestCreateWorkflow(t *testing.T) {
WorkflowActions: []WorkflowAction{
{
Type: WorkflowActionTypeColumn,
Value: fmt.Sprintf("%d", column.ID),
Value: strconv.FormatInt(column.ID, 10),
},
},
Enabled: true,

35
tests/integration/project_workflow_test.go
View File

@ -4,9 +4,9 @@
package integration
import (
"encoding/json"
"fmt"
"net/http"
"strconv"
"strings"
"testing"
@ -15,6 +15,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/tests"
"github.com/stretchr/testify/assert"
@ -64,7 +65,7 @@ func TestProjectWorkflowsPage(t *testing.T) {
WorkflowActions: []project_model.WorkflowAction{
{
Type: project_model.WorkflowActionTypeColumn,
Value: fmt.Sprintf("%d", column1.ID),
Value: strconv.FormatInt(column1.ID, 10),
},
},
Enabled: true,
@ -84,7 +85,7 @@ func TestProjectWorkflowsPage(t *testing.T) {
WorkflowActions: []project_model.WorkflowAction{
{
Type: project_model.WorkflowActionTypeColumn,
Value: fmt.Sprintf("%d", column2.ID),
Value: strconv.FormatInt(column2.ID, 10),
},
},
Enabled: false, // Disabled workflow
@ -101,20 +102,20 @@ func TestProjectWorkflowsPage(t *testing.T) {
htmlDoc := NewHTMLParser(t, resp.Body)
// Verify the main workflow container exists
assert.True(t, htmlDoc.Find("#project-workflows").Length() > 0, "Main workflow container should exist")
assert.Positive(t, htmlDoc.Find("#project-workflows").Length(), "Main workflow container should exist")
// Verify data attributes are set correctly
workflowDiv := htmlDoc.Find("#project-workflows")
assert.True(t, workflowDiv.Length() > 0, "Workflow div should exist")
assert.Positive(t, workflowDiv.Length(), "Workflow div should exist")
// Check that locale data attributes exist
assert.True(t, workflowDiv.AttrOr("data-locale-default-workflows", "") != "", "data-locale-default-workflows should be set")
assert.True(t, workflowDiv.AttrOr("data-locale-when", "") != "", "data-locale-when should be set")
assert.True(t, workflowDiv.AttrOr("data-locale-actions", "") != "", "data-locale-actions should be set")
assert.True(t, workflowDiv.AttrOr("data-locale-filters", "") != "", "data-locale-filters should be set")
assert.True(t, workflowDiv.AttrOr("data-locale-close-issue", "") != "", "data-locale-close-issue should be set")
assert.True(t, workflowDiv.AttrOr("data-locale-reopen-issue", "") != "", "data-locale-reopen-issue should be set")
assert.True(t, workflowDiv.AttrOr("data-locale-issues-and-pull-requests", "") != "", "data-locale-issues-and-pull-requests should be set")
assert.NotEmpty(t, workflowDiv.AttrOr("data-locale-default-workflows", ""), "data-locale-default-workflows should be set")
assert.NotEmpty(t, workflowDiv.AttrOr("data-locale-when", ""), "data-locale-when should be set")
assert.NotEmpty(t, workflowDiv.AttrOr("data-locale-actions", ""), "data-locale-actions should be set")
assert.NotEmpty(t, workflowDiv.AttrOr("data-locale-filters", ""), "data-locale-filters should be set")
assert.NotEmpty(t, workflowDiv.AttrOr("data-locale-close-issue", ""), "data-locale-close-issue should be set")
assert.NotEmpty(t, workflowDiv.AttrOr("data-locale-reopen-issue", ""), "data-locale-reopen-issue should be set")
assert.NotEmpty(t, workflowDiv.AttrOr("data-locale-issues-and-pull-requests", ""), "data-locale-issues-and-pull-requests should be set")
// Verify project link is set
projectLink := workflowDiv.AttrOr("data-project-link", "")
@ -173,7 +174,7 @@ func TestProjectWorkflowCreate(t *testing.T) {
string(project_model.WorkflowFilterTypeIssueType): "issue",
},
"actions": map[string]any{
string(project_model.WorkflowActionTypeColumn): fmt.Sprintf("%d", column.ID),
string(project_model.WorkflowActionTypeColumn): strconv.FormatInt(column.ID, 10),
},
}
@ -237,7 +238,7 @@ func TestProjectWorkflowUpdate(t *testing.T) {
WorkflowActions: []project_model.WorkflowAction{
{
Type: project_model.WorkflowActionTypeColumn,
Value: fmt.Sprintf("%d", column.ID),
Value: strconv.FormatInt(column.ID, 10),
},
},
Enabled: true,
@ -249,12 +250,12 @@ func TestProjectWorkflowUpdate(t *testing.T) {
// Update the workflow
updateData := map[string]any{
"event_id": fmt.Sprintf("%d", workflow.ID),
"event_id": strconv.FormatInt(workflow.ID, 10),
"filters": map[string]any{
string(project_model.WorkflowFilterTypeIssueType): "pull_request", // Change to PR
},
"actions": map[string]any{
string(project_model.WorkflowActionTypeColumn): fmt.Sprintf("%d", column.ID),
string(project_model.WorkflowActionTypeColumn): strconv.FormatInt(column.ID, 10),
},
}
@ -401,7 +402,7 @@ func TestProjectWorkflowDelete(t *testing.T) {
// Verify we cannot delete it again (should fail gracefully)
req = NewRequest(t, "POST",
fmt.Sprintf("/%s/%s/projects/%d/workflows/%d/delete?_csrf=%s", user.Name, repo.Name, project.ID, workflow.ID, GetUserCSRFToken(t, session)))
resp = session.MakeRequest(t, req, http.StatusNotFound)
session.MakeRequest(t, req, http.StatusNotFound)
}
func TestProjectWorkflowPermissions(t *testing.T) {