Skip to content

Commit 4aa0f25

Browse files
Update history guard regression expectations
1 parent b8316e9 commit 4aa0f25

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

tests/versioning-guard.test.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ test('standards guard scripts exist with expected core checks', () => {
425425
assert.match(mainBranchHistoryGuard, /Main branch history guard skipped/);
426426
assert.match(mainBranchHistoryGuard, /FVPLUS_MAIN_HISTORY_BASE_REF/);
427427
assert.match(mainBranchHistoryGuard, /@\{upstream\}\.\.HEAD/);
428-
assert.match(mainBranchHistoryGuard, /merge commits are not allowed/);
428+
assert.match(mainBranchHistoryGuard, /merge_commit_allowed/);
429+
assert.match(mainBranchHistoryGuard, /main-branch merge commits must promote only dev\/beta history/);
429430
assert.match(mainBranchHistoryGuard, /Main branch history guard passed/);
430431
assert.match(unraidMatrixSmoke, /FVPLUS_UNRAID_MATRIX/);
431432
assert.match(unraidMatrixSmoke, /Skipping Unraid matrix smoke checks/);

0 commit comments

Comments
 (0)