Skip to content

Commit 6c7e965

Browse files
Coly010Coly010
committed
chore(release): fix e2es
1 parent c3abcb0 commit 6c7e965

6 files changed

+96
-96
lines changed

‎e2e/release/src/conventional-commits-config.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ describe('nx release conventional commits config', () => {
256256
`${pkg1} 🚫 No changes were detected using git history and the conventional commits standard`
257257
);
258258
expect(versionResultCustomTypeChanges).toContain(
259-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
259+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
260260
);
261261
expect(versionResultCustomTypeChanges).toContain(
262262
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -282,10 +282,10 @@ describe('nx release conventional commits config', () => {
282282

283283
const versionResultCustomTypeBreakingChanges = runCLI(`release version -d`);
284284
expect(versionResultCustomTypeBreakingChanges).toContain(
285-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
285+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
286286
);
287287
expect(versionResultCustomTypeBreakingChanges).toContain(
288-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
288+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
289289
);
290290
expect(versionResultCustomTypeBreakingChanges).toContain(
291291
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -309,10 +309,10 @@ describe('nx release conventional commits config', () => {
309309

310310
const versionResultChoreChanges = runCLI(`release version -d`);
311311
expect(versionResultChoreChanges).toContain(
312-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
312+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
313313
);
314314
expect(versionResultChoreChanges).toContain(
315-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
315+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
316316
);
317317
expect(versionResultChoreChanges).toContain(
318318
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -338,10 +338,10 @@ describe('nx release conventional commits config', () => {
338338

339339
const versionResultPerfChanges = runCLI(`release version -d`);
340340
expect(versionResultPerfChanges).toContain(
341-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
341+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
342342
);
343343
expect(versionResultPerfChanges).toContain(
344-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
344+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
345345
);
346346
expect(versionResultPerfChanges).toContain(
347347
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -365,10 +365,10 @@ describe('nx release conventional commits config', () => {
365365

366366
const versionResultRefactorChanges = runCLI(`release version -d`);
367367
expect(versionResultRefactorChanges).toContain(
368-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
368+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
369369
);
370370
expect(versionResultRefactorChanges).toContain(
371-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
371+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
372372
);
373373
expect(versionResultRefactorChanges).toContain(
374374
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -522,7 +522,7 @@ describe('nx release conventional commits config', () => {
522522
const versionResultFixCommit = runCLI(`release version -d`);
523523

524524
expect(versionResultFixCommit).toContain(
525-
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
525+
`${pkg1} ✍️ New version 0.0.2 written to manifest: ${pkg1}/package.json`
526526
);
527527
expect(versionResultFixCommit).toContain(
528528
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`

‎e2e/release/src/conventional-commits-config.workspaces.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ describe('nx release conventional commits config', () => {
263263
`${pkg1} 🚫 No changes were detected using git history and the conventional commits standard`
264264
);
265265
expect(versionResultCustomTypeChanges).toContain(
266-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
266+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
267267
);
268268
expect(versionResultCustomTypeChanges).toContain(
269269
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -289,10 +289,10 @@ describe('nx release conventional commits config', () => {
289289

290290
const versionResultCustomTypeBreakingChanges = runCLI(`release version -d`);
291291
expect(versionResultCustomTypeBreakingChanges).toContain(
292-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
292+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
293293
);
294294
expect(versionResultCustomTypeBreakingChanges).toContain(
295-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
295+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
296296
);
297297
expect(versionResultCustomTypeBreakingChanges).toContain(
298298
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -316,10 +316,10 @@ describe('nx release conventional commits config', () => {
316316

317317
const versionResultChoreChanges = runCLI(`release version -d`);
318318
expect(versionResultChoreChanges).toContain(
319-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
319+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
320320
);
321321
expect(versionResultChoreChanges).toContain(
322-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
322+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
323323
);
324324
expect(versionResultChoreChanges).toContain(
325325
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -345,10 +345,10 @@ describe('nx release conventional commits config', () => {
345345

346346
const versionResultPerfChanges = runCLI(`release version -d`);
347347
expect(versionResultPerfChanges).toContain(
348-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
348+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
349349
);
350350
expect(versionResultPerfChanges).toContain(
351-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
351+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
352352
);
353353
expect(versionResultPerfChanges).toContain(
354354
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -372,10 +372,10 @@ describe('nx release conventional commits config', () => {
372372

373373
const versionResultRefactorChanges = runCLI(`release version -d`);
374374
expect(versionResultRefactorChanges).toContain(
375-
`${pkg1} ✍️ New version 1.0.0 written to manifest: ${pkg1}/package.json`
375+
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
376376
);
377377
expect(versionResultRefactorChanges).toContain(
378-
`${pkg2} ✍️ New version 0.1.0 written to manifest: ${pkg2}/package.json`
378+
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`
379379
);
380380
expect(versionResultRefactorChanges).toContain(
381381
`${pkg3} ✍️ New version 0.0.2 written to manifest: ${pkg3}/package.json`
@@ -529,7 +529,7 @@ describe('nx release conventional commits config', () => {
529529
const versionResultFixCommit = runCLI(`release version -d`);
530530

531531
expect(versionResultFixCommit).toContain(
532-
`${pkg1} ✍️ New version 0.1.0 written to manifest: ${pkg1}/package.json`
532+
`${pkg1} ✍️ New version 0.0.2 written to manifest: ${pkg1}/package.json`
533533
);
534534
expect(versionResultFixCommit).toContain(
535535
`${pkg2} ✍️ New version 0.0.2 written to manifest: ${pkg2}/package.json`

‎e2e/release/src/multiple-release-branches.test.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ describe('nx release multiple release branches', () => {
107107
runCommand(`git add ${pkg1}/package.json`);
108108
runCommand(`git commit -m "feat(${pkg1}): new feature 1"`);
109109

110-
const versionResult1x = runCLI(`release version minor`);
110+
const versionResult1x = runCLI(`release version major`);
111111

112112
// update my-pkg-2 with a fix commit
113113
updateJson(`${pkg2}/package.json`, (json) => ({
@@ -170,7 +170,7 @@ describe('nx release multiple release branches', () => {
170170
NX Running release version for project: {project-name}
171171
172172
{project-name} 🏷️ Resolved the current version as 0.0.7 from git tag "v0.0.7", based on releaseTagPattern "v{version}"
173-
{project-name} ❓ Applied semver relative bump "minor", from the given specifier, to get new version 0.1.0
173+
{project-name} ❓ Applied semver relative bump "major", from the given specifier, to get new version 0.1.0
174174
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
175175
176176
NX Running release version for project: {project-name}
@@ -309,25 +309,25 @@ describe('nx release multiple release branches', () => {
309309
NX Running release version for project: {project-name}
310310
311311
{project-name} ⚠️ Unable to resolve the current version from git tags using pattern "v{version}". Falling back to the version 0.0.0 in manifest: {project-name}/package.json
312-
{project-name} ❓ Applied semver relative bump "minor", from the given specifier, to get new version 0.1.0
313-
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
312+
{project-name} ❓ Applied semver relative bump "minor", from the given specifier, to get new version 0.0.1
313+
{project-name} ✍️ New version 0.0.1 written to manifest: {project-name}/package.json
314314
315315
NX Running release version for project: {project-name}
316316
317317
{project-name} 🔄 Reusing the current version 0.0.0 already resolved for {project-name} from the disk fallback
318-
{project-name} ❓ Applied version 0.1.0 directly, because the project is a member of a fixed release group containing {project-name}
319-
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
318+
{project-name} ❓ Applied version 0.0.1 directly, because the project is a member of a fixed release group containing {project-name}
319+
{project-name} ✍️ New version 0.0.1 written to manifest: {project-name}/package.json
320320
321321
NX Running release version for project: {project-name}
322322
323323
{project-name} 🔄 Reusing the current version 0.0.0 already resolved for {project-name} from the disk fallback
324-
{project-name} ❓ Applied version 0.1.0 directly, because the project is a member of a fixed release group containing {project-name}
325-
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
324+
{project-name} ❓ Applied version 0.0.1 directly, because the project is a member of a fixed release group containing {project-name}
325+
{project-name} ✍️ New version 0.0.1 written to manifest: {project-name}/package.json
326326
327327
328328
"name": "@proj/{project-name}",
329329
- "version": "0.0.0",
330-
+ "version": "0.1.0",
330+
+ "version": "0.0.1",
331331
"exports": {
332332
333333
}
@@ -336,13 +336,13 @@ describe('nx release multiple release branches', () => {
336336
337337
"name": "@proj/{project-name}",
338338
- "version": "0.0.0",
339-
+ "version": "0.1.0",
339+
+ "version": "0.0.1",
340340
"exports": {
341341
342342
343343
"name": "@proj/{project-name}",
344344
- "version": "0.0.0",
345-
+ "version": "0.1.0",
345+
+ "version": "0.0.1",
346346
"exports": {
347347
348348
@@ -357,32 +357,32 @@ describe('nx release multiple release branches', () => {
357357
358358
NX Running release version for project: {project-name}
359359
360-
{project-name} 🏷️ Resolved the current version as 0.1.0 from git tag "v0.1.0", based on releaseTagPattern "v{version}"
361-
{project-name} ❓ Applied semver relative bump "major", from the given specifier, to get new version 1.0.0
362-
{project-name} ✍️ New version 1.0.0 written to manifest: {project-name}/package.json
360+
{project-name} 🏷️ Resolved the current version as 0.0.1 from git tag "v0.0.1", based on releaseTagPattern "v{version}"
361+
{project-name} ❓ Applied semver relative bump "major", from the given specifier, to get new version 0.1.0
362+
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
363363
364364
NX Running release version for project: {project-name}
365365
366-
{project-name} 🔄 Reusing the current version 0.1.0 already resolved for {project-name} from git tag "v0.1.0"
367-
{project-name} ❓ Applied version 1.0.0 directly, because the project is a member of a fixed release group containing {project-name}
368-
{project-name} ✍️ New version 1.0.0 written to manifest: {project-name}/package.json
366+
{project-name} 🔄 Reusing the current version 0.0.1 already resolved for {project-name} from git tag "v0.0.1"
367+
{project-name} ❓ Applied version 0.1.0 directly, because the project is a member of a fixed release group containing {project-name}
368+
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
369369
370370
NX Running release version for project: {project-name}
371371
372-
{project-name} 🔄 Reusing the current version 0.1.0 already resolved for {project-name} from git tag "v0.1.0"
373-
{project-name} ❓ Applied version 1.0.0 directly, because the project is a member of a fixed release group containing {project-name}
374-
{project-name} ✍️ New version 1.0.0 written to manifest: {project-name}/package.json
372+
{project-name} 🔄 Reusing the current version 0.0.1 already resolved for {project-name} from git tag "v0.0.1"
373+
{project-name} ❓ Applied version 0.1.0 directly, because the project is a member of a fixed release group containing {project-name}
374+
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
375375
376376
377377
"name": "@proj/{project-name}",
378378
- "version": "0.0.0",
379-
+ "version": "1.0.0",
379+
+ "version": "0.1.0",
380380
"exports": {
381381
382382
383383
"name": "@proj/{project-name}",
384384
- "version": "0.0.0",
385-
+ "version": "1.0.0",
385+
+ "version": "0.1.0",
386386
"exports": {
387387
388388
}
@@ -391,7 +391,7 @@ describe('nx release multiple release branches', () => {
391391
392392
"name": "@proj/{project-name}",
393393
- "version": "0.0.0",
394-
+ "version": "1.0.0",
394+
+ "version": "0.1.0",
395395
"exports": {
396396
397397

‎e2e/release/src/preserve-local-dependency-protocols.test.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,24 +140,24 @@ describe('nx release preserve local dependency protocols', () => {
140140
.toMatchInlineSnapshot(`
141141
NX Running release version for project: {project-name}
142142
{project-name} 📄 Resolved the current version as 0.0.0 from manifest: {project-name}/package.json
143-
{project-name} ❓ Applied semver relative bump "minor", from the given specifier, to get new version 0.1.0
144-
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
143+
{project-name} ❓ Applied semver relative bump "minor", from the given specifier, to get new version 0.0.1
144+
{project-name} ✍️ New version 0.0.1 written to manifest: {project-name}/package.json
145145
{project-name} ✍️ Updated 1 dependency in manifest: {project-name}/package.json
146146
NX Running release version for project: {project-name}
147147
{project-name} 📄 Resolved the current version as 0.0.0 from manifest: {project-name}/package.json
148-
{project-name} ❓ Applied version 0.1.0 directly, because the project is a member of a fixed release group containing {project-name}
149-
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
148+
{project-name} ❓ Applied version 0.0.1 directly, because the project is a member of a fixed release group containing {project-name}
149+
{project-name} ✍️ New version 0.0.1 written to manifest: {project-name}/package.json
150150
"name": "@proj/{project-name}",
151151
- "version": "0.0.0",
152-
+ "version": "0.1.0",
152+
+ "version": "0.0.1",
153153
"exports": {
154154
"name": "@proj/{project-name}",
155155
- "version": "0.0.0",
156-
+ "version": "0.1.0",
156+
+ "version": "0.0.1",
157157
"exports": {
158158
"dependencies": {
159159
- "@proj/{project-name}": "workspace:*"
160-
+ "@proj/{project-name}": "0.1.0"
160+
+ "@proj/{project-name}": "0.0.1"
161161
}
162162
}
163163
+
@@ -186,19 +186,19 @@ describe('nx release preserve local dependency protocols', () => {
186186
.toMatchInlineSnapshot(`
187187
NX Running release version for project: {project-name}
188188
{project-name} 📄 Resolved the current version as 0.0.0 from manifest: {project-name}/package.json
189-
{project-name} ❓ Applied semver relative bump "minor", from the given specifier, to get new version 0.1.0
190-
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
189+
{project-name} ❓ Applied semver relative bump "minor", from the given specifier, to get new version 0.0.1
190+
{project-name} ✍️ New version 0.0.1 written to manifest: {project-name}/package.json
191191
NX Running release version for project: {project-name}
192192
{project-name} 📄 Resolved the current version as 0.0.0 from manifest: {project-name}/package.json
193-
{project-name} ❓ Applied version 0.1.0 directly, because the project is a member of a fixed release group containing {project-name}
194-
{project-name} ✍️ New version 0.1.0 written to manifest: {project-name}/package.json
193+
{project-name} ❓ Applied version 0.0.1 directly, because the project is a member of a fixed release group containing {project-name}
194+
{project-name} ✍️ New version 0.0.1 written to manifest: {project-name}/package.json
195195
"name": "@proj/{project-name}",
196196
- "version": "0.0.0",
197-
+ "version": "0.1.0",
197+
+ "version": "0.0.1",
198198
"exports": {
199199
"name": "@proj/{project-name}",
200200
- "version": "0.0.0",
201-
+ "version": "0.1.0",
201+
+ "version": "0.0.1",
202202
"exports": {
203203
}
204204
+

‎e2e/release/src/version-plans-filtered-release.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Update packages 3 with major
110110
const result = runCLI(`release -p ${pkg1} --skip-publish --verbose`);
111111

112112
// Verify pkg1 was versioned
113-
expect(readJson(`${pkg1}/package.json`).version).toEqual('0.1.0');
113+
expect(readJson(`${pkg1}/package.json`).version).toEqual('0.0.2');
114114

115115
// Verify pkg2 and pkg3 were NOT versioned
116116
expect(readJson(`${pkg2}/package.json`).version).toEqual('0.0.1');

0 commit comments

Comments
 (0)