Skip to content

Commit 2343d18

Browse files
committed
fix(e2e): narrow counted release versions structurally
1 parent 17dcadf commit 2343d18

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

e2e/lib/vitest/packaged-update-scenario.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ function nextStablePatch(version: string): string {
7979
}
8080

8181
function nextHyphenPrerelease(version: string, label: string): string {
82-
if (label !== 'beta' && label !== 'betas' && label !== 'prerelease' && label !== 'preview') {
82+
if (!isReleaseChannel(label) || label === 'stable') {
8383
throw new Error(`unsupported counted release channel: ${label}`);
8484
}
8585
const parsed = parseReleaseVersion(version, label);
86-
if (parsed.channel === 'stable') {
86+
if (!("number" in parsed)) {
8787
throw new Error(`${label} release version must be x.y.z-${label}.N; got ${version}`);
8888
}
8989
return formatReleaseVersion(label, parsed.baseVersion, parsed.number + 1);

e2e/tests/packaged/update-scenario.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('packaged updater release scenario', () => {
2727
});
2828
});
2929

30-
test('derives stable, prerelease, preview, beta, and betas next-version fixtures', () => {
30+
test('derives stable, prerelease, and data-defined exact next-version fixtures', () => {
3131
expect(resolvePackagedUpdateScenario({
3232
releaseChannel: 'stable',
3333
releaseVersion: '0.8.0',
@@ -37,17 +37,17 @@ describe('packaged updater release scenario', () => {
3737
releaseVersion: '0.8.0-prerelease.2',
3838
}).fixtureVersion).toBe('0.8.0-prerelease.3');
3939
expect(resolvePackagedUpdateScenario({
40-
releaseChannel: 'preview',
41-
releaseVersion: '0.8.0-preview.2',
42-
}).fixtureVersion).toBe('0.8.0-preview.3');
40+
releaseChannel: 'canary',
41+
releaseVersion: '0.8.0-canary.2',
42+
}).fixtureVersion).toBe('0.8.0-canary.3');
4343
expect(resolvePackagedUpdateScenario({
4444
releaseChannel: 'beta',
4545
releaseVersion: '0.8.0-beta.2',
4646
}).fixtureVersion).toBe('0.8.0-beta.3');
4747
expect(resolvePackagedUpdateScenario({
48-
releaseChannel: 'betas',
49-
releaseVersion: '0.8.0-betas.2',
50-
}).fixtureVersion).toBe('0.8.0-betas.3');
48+
releaseChannel: 'qa2',
49+
releaseVersion: '0.8.0-qa2.2',
50+
}).fixtureVersion).toBe('0.8.0-qa2.3');
5151
});
5252

5353
test('does not override current version for release-channel smoke', () => {

0 commit comments

Comments
 (0)