Skip to content

Commit 883c8eb

Browse files
badhezibadhezi
committed
fix integration tests
1 parent 2fb5f3f commit 883c8eb

File tree

1 file changed

+82
-54
lines changed

1 file changed

+82
-54
lines changed

‎tests/integration/actions_trigger_test.go

Lines changed: 82 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -414,38 +414,47 @@ jobs:
414414
err = repo_service.CreateNewBranchFromCommit(db.DefaultContext, user2, repo, gitRepo, branch.CommitID, "test-create-branch")
415415
assert.NoError(t, err)
416416
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
417-
Title: "add workflow",
418-
RepoID: repo.ID,
419-
Event: "create",
420-
Ref: "refs/heads/test-create-branch",
421-
WorkflowID: "createdelete.yml",
422-
CommitSHA: branch.CommitID,
417+
Title: "add workflow",
418+
RepoID: repo.ID,
419+
Repo: repo,
420+
Event: "create",
421+
Ref: "refs/heads/test-create-branch",
422+
WorkflowID: "createdelete.yml",
423+
CommitSHA: branch.CommitID,
424+
TriggerUserID: user2.ID,
425+
TriggerUser: user2,
423426
})
424427
assert.NotNil(t, run)
425428

426429
// create a tag
427430
err = release_service.CreateNewTag(db.DefaultContext, user2, repo, branch.CommitID, "test-create-tag", "test create tag event")
428431
assert.NoError(t, err)
429432
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
430-
Title: "add workflow",
431-
RepoID: repo.ID,
432-
Event: "create",
433-
Ref: "refs/tags/test-create-tag",
434-
WorkflowID: "createdelete.yml",
435-
CommitSHA: branch.CommitID,
433+
Title: "add workflow",
434+
RepoID: repo.ID,
435+
Repo: repo,
436+
Event: "create",
437+
Ref: "refs/tags/test-create-tag",
438+
WorkflowID: "createdelete.yml",
439+
CommitSHA: branch.CommitID,
440+
TriggerUserID: user2.ID,
441+
TriggerUser: user2,
436442
})
437443
assert.NotNil(t, run)
438444

439445
// delete the branch
440446
err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch", nil)
441447
assert.NoError(t, err)
442448
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
443-
Title: "add workflow",
444-
RepoID: repo.ID,
445-
Event: "delete",
446-
Ref: "refs/heads/main",
447-
WorkflowID: "createdelete.yml",
448-
CommitSHA: branch.CommitID,
449+
Title: "add workflow",
450+
RepoID: repo.ID,
451+
Repo: repo,
452+
Event: "delete",
453+
Ref: "refs/heads/main",
454+
WorkflowID: "createdelete.yml",
455+
CommitSHA: branch.CommitID,
456+
TriggerUserID: user2.ID,
457+
TriggerUser: user2,
449458
})
450459
assert.NotNil(t, run)
451460

@@ -455,12 +464,15 @@ jobs:
455464
err = release_service.DeleteReleaseByID(db.DefaultContext, repo, tag, user2, true)
456465
assert.NoError(t, err)
457466
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
458-
Title: "add workflow",
459-
RepoID: repo.ID,
460-
Event: "delete",
461-
Ref: "refs/heads/main",
462-
WorkflowID: "createdelete.yml",
463-
CommitSHA: branch.CommitID,
467+
Title: "add workflow",
468+
RepoID: repo.ID,
469+
Repo: repo,
470+
Event: "delete",
471+
Ref: "refs/heads/main",
472+
WorkflowID: "createdelete.yml",
473+
CommitSHA: branch.CommitID,
474+
TriggerUserID: user2.ID,
475+
TriggerUser: user2,
464476
})
465477
assert.NotNil(t, run)
466478
})
@@ -762,12 +774,15 @@ jobs:
762774
_ = MakeRequest(t, req, http.StatusNoContent)
763775

764776
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
765-
Title: "add workflow",
766-
RepoID: repo.ID,
767-
Event: "workflow_dispatch",
768-
Ref: "refs/heads/main",
769-
WorkflowID: "dispatch.yml",
770-
CommitSHA: branch.CommitID,
777+
Title: "add workflow",
778+
RepoID: repo.ID,
779+
Repo: repo,
780+
Event: "workflow_dispatch",
781+
Ref: "refs/heads/main",
782+
WorkflowID: "dispatch.yml",
783+
CommitSHA: branch.CommitID,
784+
TriggerUserID: user2.ID,
785+
TriggerUser: user2,
771786
})
772787
assert.NotNil(t, run)
773788
})
@@ -844,12 +859,15 @@ jobs:
844859
_ = MakeRequest(t, req, http.StatusNoContent)
845860

846861
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
847-
Title: "add workflow",
848-
RepoID: repo.ID,
849-
Event: "workflow_dispatch",
850-
Ref: "refs/heads/main",
851-
WorkflowID: "dispatch.yml",
852-
CommitSHA: branch.CommitID,
862+
Title: "add workflow",
863+
RepoID: repo.ID,
864+
Repo: repo,
865+
Event: "workflow_dispatch",
866+
Ref: "refs/heads/main",
867+
WorkflowID: "dispatch.yml",
868+
CommitSHA: branch.CommitID,
869+
TriggerUserID: user2.ID,
870+
TriggerUser: user2,
853871
})
854872
assert.NotNil(t, run)
855873
dispatchPayload := &api.WorkflowDispatchPayload{}
@@ -939,12 +957,15 @@ jobs:
939957
_ = MakeRequest(t, req, http.StatusNoContent)
940958

941959
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
942-
Title: "add workflow",
943-
RepoID: repo.ID,
944-
Event: "workflow_dispatch",
945-
Ref: "refs/heads/main",
946-
WorkflowID: "dispatch.yml",
947-
CommitSHA: branch.CommitID,
960+
Title: "add workflow",
961+
RepoID: repo.ID,
962+
Repo: repo,
963+
Event: "workflow_dispatch",
964+
Ref: "refs/heads/main",
965+
WorkflowID: "dispatch.yml",
966+
CommitSHA: branch.CommitID,
967+
TriggerUserID: user2.ID,
968+
TriggerUser: user2,
948969
})
949970
assert.NotNil(t, run)
950971
})
@@ -1024,12 +1045,15 @@ jobs:
10241045
_ = MakeRequest(t, req, http.StatusNoContent)
10251046

10261047
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
1027-
Title: "add workflow",
1028-
RepoID: repo.ID,
1029-
Event: "workflow_dispatch",
1030-
Ref: "refs/heads/main",
1031-
WorkflowID: "dispatch.yml",
1032-
CommitSHA: branch.CommitID,
1048+
Title: "add workflow",
1049+
RepoID: repo.ID,
1050+
Repo: repo,
1051+
Event: "workflow_dispatch",
1052+
Ref: "refs/heads/main",
1053+
WorkflowID: "dispatch.yml",
1054+
CommitSHA: branch.CommitID,
1055+
TriggerUserID: user2.ID,
1056+
TriggerUser: user2,
10331057
})
10341058
assert.NotNil(t, run)
10351059
dispatchPayload := &api.WorkflowDispatchPayload{}
@@ -1156,6 +1180,7 @@ jobs:
11561180
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
11571181
Title: "add workflow",
11581182
RepoID: repo.ID,
1183+
Repo: repo,
11591184
Event: "workflow_dispatch",
11601185
Ref: "refs/heads/dispatch",
11611186
WorkflowID: "dispatch.yml",
@@ -1351,12 +1376,15 @@ jobs:
13511376
_ = MakeRequest(t, req, http.StatusNoContent)
13521377

13531378
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
1354-
Title: "add workflow",
1355-
RepoID: repo.ID,
1356-
Event: "workflow_dispatch",
1357-
Ref: "refs/heads/main",
1358-
WorkflowID: "dispatch.yml",
1359-
CommitSHA: branch.CommitID,
1379+
Title: "add workflow",
1380+
RepoID: repo.ID,
1381+
Repo: repo,
1382+
Event: "workflow_dispatch",
1383+
Ref: "refs/heads/main",
1384+
WorkflowID: "dispatch.yml",
1385+
CommitSHA: branch.CommitID,
1386+
TriggerUserID: user2.ID,
1387+
TriggerUser: user2,
13601388
})
13611389
assert.NotNil(t, run)
13621390
dispatchPayload := &api.WorkflowDispatchPayload{}

0 commit comments

Comments
 (0)