Skip to content

Commit d6db24c

Browse files
committed
add org test
1 parent 93d464b commit d6db24c

File tree

3 files changed

+66
-2
lines changed

3 files changed

+66
-2
lines changed

tests/integration/api_admin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ func TestAPIRunnerAdminApi(t *testing.T) {
437437
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/admin/actions/runners/%d", runnerList.Entries[0].ID)).AddTokenAuth(token)
438438
MakeRequest(t, req, http.StatusNoContent)
439439

440-
// Verify get the runner has been deleted
440+
// Verify runner deletion
441441
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/admin/actions/runners/%d", runnerList.Entries[0].ID)).AddTokenAuth(token)
442442
MakeRequest(t, req, http.StatusNotFound)
443443
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// Copyright 2025 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package integration
5+
6+
import (
7+
"fmt"
8+
"net/http"
9+
"testing"
10+
11+
auth_model "code.gitea.io/gitea/models/auth"
12+
api "code.gitea.io/gitea/modules/structs"
13+
"code.gitea.io/gitea/tests"
14+
15+
"github.com/stretchr/testify/assert"
16+
)
17+
18+
func TestAPIRunnerOrgApi(t *testing.T) {
19+
defer tests.PrepareTestEnv(t)()
20+
userUsername := "user2"
21+
token := getUserToken(t, userUsername, auth_model.AccessTokenScopeWriteOrganization)
22+
req := NewRequest(t, "POST", "/api/v1/orgs/org3/actions/runners/registration-token").AddTokenAuth(token)
23+
tokenResp := MakeRequest(t, req, http.StatusOK)
24+
var registrationToken struct {
25+
Token string `json:"token"`
26+
}
27+
DecodeJSON(t, tokenResp, &registrationToken)
28+
assert.NotEmpty(t, registrationToken.Token)
29+
30+
req = NewRequest(t, "GET", "/api/v1/orgs/org3/actions/runners").AddTokenAuth(token)
31+
runnerListResp := MakeRequest(t, req, http.StatusOK)
32+
runnerList := api.ActionRunnersResponse{}
33+
DecodeJSON(t, runnerListResp, &runnerList)
34+
35+
assert.Len(t, runnerList.Entries, 1)
36+
assert.Equal(t, "runner_to_be_deleted-org", runnerList.Entries[0].Name)
37+
assert.Equal(t, int64(34347), runnerList.Entries[0].ID)
38+
assert.False(t, runnerList.Entries[0].Ephemeral)
39+
assert.Len(t, runnerList.Entries[0].Labels, 2)
40+
assert.Equal(t, "runner_to_be_deleted", runnerList.Entries[0].Labels[0].Name)
41+
assert.Equal(t, "linux", runnerList.Entries[0].Labels[1].Name)
42+
43+
// Verify get the runner by id
44+
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/org3/actions/runners/%d", runnerList.Entries[0].ID)).AddTokenAuth(token)
45+
runnerResp := MakeRequest(t, req, http.StatusOK)
46+
47+
runner := api.ActionRunner{}
48+
DecodeJSON(t, runnerResp, &runner)
49+
50+
assert.Equal(t, "runner_to_be_deleted-org", runner.Name)
51+
assert.Equal(t, int64(34347), runner.ID)
52+
assert.False(t, runner.Ephemeral)
53+
assert.Len(t, runner.Labels, 2)
54+
assert.Equal(t, "runner_to_be_deleted", runner.Labels[0].Name)
55+
assert.Equal(t, "linux", runner.Labels[1].Name)
56+
57+
// Verify delete the runner by id
58+
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/org3/actions/runners/%d", runnerList.Entries[0].ID)).AddTokenAuth(token)
59+
MakeRequest(t, req, http.StatusNoContent)
60+
61+
// Verify runner deletion
62+
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/org3/actions/runners/%d", runnerList.Entries[0].ID)).AddTokenAuth(token)
63+
MakeRequest(t, req, http.StatusNotFound)
64+
}

tests/integration/api_user_runner_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestAPIRunnerUserApi(t *testing.T) {
5858
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/actions/runners/%d", runnerList.Entries[0].ID)).AddTokenAuth(token)
5959
MakeRequest(t, req, http.StatusNoContent)
6060

61-
// Verify get the runner has been deleted
61+
// Verify runner deletion
6262
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/actions/runners/%d", runnerList.Entries[0].ID)).AddTokenAuth(token)
6363
MakeRequest(t, req, http.StatusNotFound)
6464
}

0 commit comments

Comments
 (0)