@verdaccio/e2e-cli 2.3.0 → 2.5.0

package/build/esm/tests/deprecate.js

@@ -1,58 +1,97 @@
+import buildDebug from "debug";
+import { join } from "path";
+import { readFile, writeFile } from "fs/promises";
 import assert from "assert";
 //#region src/tests/deprecate.ts
+var debug = buildDebug("verdaccio:e2e-cli:test:deprecate");
 async function publishPkg(ctx, tempFolder, pkgName) {
+	if (ctx.adapter.type === "yarn-modern") {
+		debug("running yarn install before publish for %s", pkgName);
+		await ctx.adapter.exec({ cwd: tempFolder }, "install");
+	}
+	debug("publishing %s from %s", pkgName, tempFolder);
 	await ctx.adapter.exec({ cwd: tempFolder }, "publish", ...ctx.adapter.registryArg(ctx.registryUrl));
+	debug("published %s successfully", pkgName);
 }
 async function deprecate(ctx, tempFolder, packageVersion, message) {
-	await ctx.adapter.exec({ cwd: tempFolder }, "deprecate", packageVersion, message, "--json", ...ctx.adapter.registryArg(ctx.registryUrl));
+	debug("deprecating %s with message: %s", packageVersion, message || "(empty, un-deprecate)");
+	const jsonFlag = ctx.adapter.type === "yarn-modern" ? [] : ["--json"];
+	await ctx.adapter.exec({ cwd: tempFolder }, "deprecate", packageVersion, message, ...jsonFlag, ...ctx.adapter.registryArg(ctx.registryUrl));
+	debug("deprecate command completed for %s", packageVersion);
 }
-async function getInfo(ctx, pkgName) {
-	const resp = await ctx.adapter.exec({}, "info", pkgName, "--json", ...ctx.adapter.registryArg(ctx.registryUrl));
-	return JSON.parse(resp.stdout);
+async function getInfo(ctx, tempFolder, pkgName) {
+	debug("fetching info for %s", pkgName);
+	const resp = await ctx.adapter.exec({ cwd: tempFolder }, "info", pkgName, "--json", ...ctx.adapter.registryArg(ctx.registryUrl));
+	const parsed = JSON.parse(resp.stdout);
+	debug("info for %s: deprecated=%s", pkgName, parsed.deprecated ?? "(not set)");
+	return parsed;
 }
 async function bumpVersion(ctx, tempFolder) {
-	await ctx.adapter.exec({ cwd: tempFolder }, "version", "minor", ...ctx.adapter.registryArg(ctx.registryUrl));
+	debug("bumping version (minor) in %s", tempFolder);
+	if (ctx.adapter.type === "yarn-modern") {
+		const pkgPath = join(tempFolder, "package.json");
+		const pkg = JSON.parse(await readFile(pkgPath, "utf8"));
+		const [major, minor, patch] = pkg.version.split(".").map(Number);
+		pkg.version = `${major}.${minor + 1}.${patch}`;
+		debug("bumped %s to %s", pkgPath, pkg.version);
+		await writeFile(pkgPath, JSON.stringify(pkg, null, 2));
+	} else await ctx.adapter.exec({ cwd: tempFolder }, "version", "minor", ...ctx.adapter.registryArg(ctx.registryUrl));
+}
+async function prepareDeprecateProject(ctx, pkgName, version) {
+	debug("preparing project for %s@%s", pkgName, version);
+	const { tempFolder } = await ctx.adapter.prepareProject(pkgName, version, ctx.registryUrl, ctx.port, ctx.token);
+	if (ctx.adapter.importPlugin) {
+		debug("importing npm-deprecate plugin into %s", tempFolder);
+		await ctx.adapter.importPlugin(tempFolder, "npm-deprecate");
+	}
+	return tempFolder;
 }
 async function testDeprecate(ctx) {
 	const id = ctx.runId;
-	const pkgName1 = `@verdaccio/dep1-${id}`;
 	const message = "some message";
-	const { tempFolder: tf1 } = await ctx.adapter.prepareProject(pkgName1, "1.0.0", ctx.registryUrl, ctx.port, ctx.token);
-	await publishPkg(ctx, tf1, pkgName1);
-	await deprecate(ctx, tf1, `${pkgName1}@1.0.0`, message);
-	const info1 = await getInfo(ctx, pkgName1);
-	assert.strictEqual(info1.name, pkgName1);
-	assert.strictEqual(info1.deprecated, message, "Package should be deprecated");
-	const pkgName2 = `@verdaccio/dep2-${id}`;
-	const { tempFolder: tf2 } = await ctx.adapter.prepareProject(pkgName2, "1.0.0", ctx.registryUrl, ctx.port, ctx.token);
-	await publishPkg(ctx, tf2, pkgName2);
-	await deprecate(ctx, tf2, `${pkgName2}@1.0.0`, message);
-	const info2a = await getInfo(ctx, pkgName2);
-	assert.strictEqual(info2a.deprecated, message);
-	await deprecate(ctx, tf2, `${pkgName2}@1.0.0`, "");
-	const info2b = await getInfo(ctx, pkgName2);
-	assert.strictEqual(info2b.deprecated, void 0, "Package should be un-deprecated");
-	const pkgName3 = `@verdaccio/dep3-${id}`;
-	const { tempFolder: tf3 } = await ctx.adapter.prepareProject(pkgName3, "1.0.0", ctx.registryUrl, ctx.port, ctx.token);
-	await publishPkg(ctx, tf3, pkgName3);
-	for (let i = 0; i < 3; i++) {
-		await bumpVersion(ctx, tf3);
-		await publishPkg(ctx, tf3, pkgName3);
-	}
-	await deprecate(ctx, tf3, pkgName3, message);
-	for (const v of [
-		"1.0.0",
-		"1.1.0",
-		"1.2.0",
-		"1.3.0"
-	]) {
-		const info = await getInfo(ctx, `${pkgName3}@${v}`);
-		assert.strictEqual(info.deprecated, message, `Version ${v} should be deprecated`);
-	}
-	await bumpVersion(ctx, tf3);
-	await publishPkg(ctx, tf3, pkgName3);
-	const info3 = await getInfo(ctx, `${pkgName3}@1.4.0`);
-	assert.strictEqual(info3.deprecated, void 0, "New version should not be deprecated");
+	await ctx.subTest("deprecate single version", async () => {
+		const pkgName = `@verdaccio/dep1-${id}`;
+		const tf = await prepareDeprecateProject(ctx, pkgName, "1.0.0");
+		await publishPkg(ctx, tf, pkgName);
+		await deprecate(ctx, tf, `${pkgName}@1.0.0`, message);
+		const info = await getInfo(ctx, tf, pkgName);
+		assert.strictEqual(info.name, pkgName);
+		assert.strictEqual(info.deprecated, message, "Package should be deprecated");
+	});
+	await ctx.subTest("un-deprecate", async () => {
+		const pkgName = `@verdaccio/dep2-${id}`;
+		const tf = await prepareDeprecateProject(ctx, pkgName, "1.0.0");
+		await publishPkg(ctx, tf, pkgName);
+		await deprecate(ctx, tf, `${pkgName}@1.0.0`, message);
+		const info1 = await getInfo(ctx, tf, pkgName);
+		assert.strictEqual(info1.deprecated, message);
+		await deprecate(ctx, tf, `${pkgName}@1.0.0`, "");
+		const info2 = await getInfo(ctx, tf, pkgName);
+		assert.strictEqual(info2.deprecated, void 0, "Package should be un-deprecated");
+	});
+	await ctx.subTest("deprecate multiple versions", async () => {
+		const pkgName = `@verdaccio/dep3-${id}`;
+		const tf = await prepareDeprecateProject(ctx, pkgName, "1.0.0");
+		await publishPkg(ctx, tf, pkgName);
+		for (let i = 0; i < 3; i++) {
+			await bumpVersion(ctx, tf);
+			await publishPkg(ctx, tf, pkgName);
+		}
+		await deprecate(ctx, tf, pkgName, message);
+		for (const v of [
+			"1.0.0",
+			"1.1.0",
+			"1.2.0",
+			"1.3.0"
+		]) {
+			const info = await getInfo(ctx, tf, `${pkgName}@${v}`);
+			assert.strictEqual(info.deprecated, message, `Version ${v} should be deprecated`);
+		}
+		await bumpVersion(ctx, tf);
+		await publishPkg(ctx, tf, pkgName);
+		const info = await getInfo(ctx, tf, `${pkgName}@1.4.0`);
+		assert.strictEqual(info.deprecated, void 0, "New version should not be deprecated");
+	});
 }
 var deprecateTest = {
 	name: "deprecate",

package/build/esm/tests/deprecate.js.map

@@ -1 +1 @@
-{"version":3,"file":"deprecate.js","names":[],"sources":["../../../src/tests/deprecate.ts"],"sourcesContent":["import assert from 'assert';\n\nimport { TestContext, TestDefinition } from '../types';\n\nasync function publishPkg(ctx: TestContext, tempFolder: string, pkgName: string) {\n  await ctx.adapter.exec(\n    { cwd: tempFolder },\n    'publish',\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n}\n\nasync function deprecate(\n  ctx: TestContext,\n  tempFolder: string,\n  packageVersion: string,\n  message: string\n) {\n  await ctx.adapter.exec(\n    { cwd: tempFolder },\n    'deprecate',\n    packageVersion,\n    message,\n    '--json',\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n}\n\nasync function getInfo(ctx: TestContext, pkgName: string) {\n  const resp = await ctx.adapter.exec(\n    {},\n    'info',\n    pkgName,\n    '--json',\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n  return JSON.parse(resp.stdout);\n}\n\nasync function bumpVersion(ctx: TestContext, tempFolder: string) {\n  await ctx.adapter.exec(\n    { cwd: tempFolder },\n    'version',\n    'minor',\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n}\n\nasync function testDeprecate(ctx: TestContext): Promise<void> {\n  const id = ctx.runId;\n\n  // Test 1: deprecate a single version\n  const pkgName1 = `@verdaccio/dep1-${id}`;\n  const message = 'some message';\n  const { tempFolder: tf1 } = await ctx.adapter.prepareProject(\n    pkgName1,\n    '1.0.0',\n    ctx.registryUrl,\n    ctx.port,\n    ctx.token\n  );\n  await publishPkg(ctx, tf1, pkgName1);\n  await deprecate(ctx, tf1, `${pkgName1}@1.0.0`, message);\n  const info1 = await getInfo(ctx, pkgName1);\n  assert.strictEqual(info1.name, pkgName1);\n  assert.strictEqual(info1.deprecated, message, 'Package should be deprecated');\n\n  // Test 2: un-deprecate\n  const pkgName2 = `@verdaccio/dep2-${id}`;\n  const { tempFolder: tf2 } = await ctx.adapter.prepareProject(\n    pkgName2,\n    '1.0.0',\n    ctx.registryUrl,\n    ctx.port,\n    ctx.token\n  );\n  await publishPkg(ctx, tf2, pkgName2);\n  await deprecate(ctx, tf2, `${pkgName2}@1.0.0`, message);\n  const info2a = await getInfo(ctx, pkgName2);\n  assert.strictEqual(info2a.deprecated, message);\n  // empty string = undeprecate\n  await deprecate(ctx, tf2, `${pkgName2}@1.0.0`, '');\n  const info2b = await getInfo(ctx, pkgName2);\n  assert.strictEqual(info2b.deprecated, undefined, 'Package should be un-deprecated');\n\n  // Test 3: deprecate multiple versions\n  const pkgName3 = `@verdaccio/dep3-${id}`;\n  const { tempFolder: tf3 } = await ctx.adapter.prepareProject(\n    pkgName3,\n    '1.0.0',\n    ctx.registryUrl,\n    ctx.port,\n    ctx.token\n  );\n  await publishPkg(ctx, tf3, pkgName3);\n  for (let i = 0; i < 3; i++) {\n    await bumpVersion(ctx, tf3);\n    await publishPkg(ctx, tf3, pkgName3);\n  }\n  await deprecate(ctx, tf3, pkgName3, message);\n  for (const v of ['1.0.0', '1.1.0', '1.2.0', '1.3.0']) {\n    const info = await getInfo(ctx, `${pkgName3}@${v}`);\n    assert.strictEqual(info.deprecated, message, `Version ${v} should be deprecated`);\n  }\n  // publish a new version after deprecation — should NOT be deprecated\n  await bumpVersion(ctx, tf3);\n  await publishPkg(ctx, tf3, pkgName3);\n  const info3 = await getInfo(ctx, `${pkgName3}@1.4.0`);\n  assert.strictEqual(info3.deprecated, undefined, 'New version should not be deprecated');\n}\n\nexport const deprecateTest: TestDefinition = {\n  name: 'deprecate',\n  requires: ['deprecate'],\n  run: testDeprecate,\n};\n"],"mappings":";;AAIA,eAAe,WAAW,KAAkB,YAAoB,SAAiB;AAC/E,OAAM,IAAI,QAAQ,KAChB,EAAE,KAAK,YAAY,EACnB,WACA,GAAG,IAAI,QAAQ,YAAY,IAAI,YAAY,CAC5C;;AAGH,eAAe,UACb,KACA,YACA,gBACA,SACA;AACA,OAAM,IAAI,QAAQ,KAChB,EAAE,KAAK,YAAY,EACnB,aACA,gBACA,SACA,UACA,GAAG,IAAI,QAAQ,YAAY,IAAI,YAAY,CAC5C;;AAGH,eAAe,QAAQ,KAAkB,SAAiB;CACxD,MAAM,OAAO,MAAM,IAAI,QAAQ,KAC7B,EAAE,EACF,QACA,SACA,UACA,GAAG,IAAI,QAAQ,YAAY,IAAI,YAAY,CAC5C;AACD,QAAO,KAAK,MAAM,KAAK,OAAO;;AAGhC,eAAe,YAAY,KAAkB,YAAoB;AAC/D,OAAM,IAAI,QAAQ,KAChB,EAAE,KAAK,YAAY,EACnB,WACA,SACA,GAAG,IAAI,QAAQ,YAAY,IAAI,YAAY,CAC5C;;AAGH,eAAe,cAAc,KAAiC;CAC5D,MAAM,KAAK,IAAI;CAGf,MAAM,WAAW,mBAAmB;CACpC,MAAM,UAAU;CAChB,MAAM,EAAE,YAAY,QAAQ,MAAM,IAAI,QAAQ,eAC5C,UACA,SACA,IAAI,aACJ,IAAI,MACJ,IAAI,MACL;AACD,OAAM,WAAW,KAAK,KAAK,SAAS;AACpC,OAAM,UAAU,KAAK,KAAK,GAAG,SAAS,SAAS,QAAQ;CACvD,MAAM,QAAQ,MAAM,QAAQ,KAAK,SAAS;AAC1C,QAAO,YAAY,MAAM,MAAM,SAAS;AACxC,QAAO,YAAY,MAAM,YAAY,SAAS,+BAA+B;CAG7E,MAAM,WAAW,mBAAmB;CACpC,MAAM,EAAE,YAAY,QAAQ,MAAM,IAAI,QAAQ,eAC5C,UACA,SACA,IAAI,aACJ,IAAI,MACJ,IAAI,MACL;AACD,OAAM,WAAW,KAAK,KAAK,SAAS;AACpC,OAAM,UAAU,KAAK,KAAK,GAAG,SAAS,SAAS,QAAQ;CACvD,MAAM,SAAS,MAAM,QAAQ,KAAK,SAAS;AAC3C,QAAO,YAAY,OAAO,YAAY,QAAQ;AAE9C,OAAM,UAAU,KAAK,KAAK,GAAG,SAAS,SAAS,GAAG;CAClD,MAAM,SAAS,MAAM,QAAQ,KAAK,SAAS;AAC3C,QAAO,YAAY,OAAO,YAAY,KAAA,GAAW,kCAAkC;CAGnF,MAAM,WAAW,mBAAmB;CACpC,MAAM,EAAE,YAAY,QAAQ,MAAM,IAAI,QAAQ,eAC5C,UACA,SACA,IAAI,aACJ,IAAI,MACJ,IAAI,MACL;AACD,OAAM,WAAW,KAAK,KAAK,SAAS;AACpC,MAAK,IAAI,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,QAAM,YAAY,KAAK,IAAI;AAC3B,QAAM,WAAW,KAAK,KAAK,SAAS;;AAEtC,OAAM,UAAU,KAAK,KAAK,UAAU,QAAQ;AAC5C,MAAK,MAAM,KAAK;EAAC;EAAS;EAAS;EAAS;EAAQ,EAAE;EACpD,MAAM,OAAO,MAAM,QAAQ,KAAK,GAAG,SAAS,GAAG,IAAI;AACnD,SAAO,YAAY,KAAK,YAAY,SAAS,WAAW,EAAE,uBAAuB;;AAGnF,OAAM,YAAY,KAAK,IAAI;AAC3B,OAAM,WAAW,KAAK,KAAK,SAAS;CACpC,MAAM,QAAQ,MAAM,QAAQ,KAAK,GAAG,SAAS,QAAQ;AACrD,QAAO,YAAY,MAAM,YAAY,KAAA,GAAW,uCAAuC;;AAGzF,IAAa,gBAAgC;CAC3C,MAAM;CACN,UAAU,CAAC,YAAY;CACvB,KAAK;CACN"}
+{"version":3,"file":"deprecate.js","names":[],"sources":["../../../src/tests/deprecate.ts"],"sourcesContent":["import assert from 'assert';\nimport buildDebug from 'debug';\nimport { readFile, writeFile } from 'fs/promises';\nimport { join } from 'path';\n\nimport { TestContext, TestDefinition } from '../types';\n\nconst debug = buildDebug('verdaccio:e2e-cli:test:deprecate');\n\nasync function publishPkg(ctx: TestContext, tempFolder: string, pkgName: string) {\n  if (ctx.adapter.type === 'yarn-modern') {\n    debug('running yarn install before publish for %s', pkgName);\n    await ctx.adapter.exec({ cwd: tempFolder }, 'install');\n  }\n  debug('publishing %s from %s', pkgName, tempFolder);\n  await ctx.adapter.exec(\n    { cwd: tempFolder },\n    'publish',\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n  debug('published %s successfully', pkgName);\n}\n\nasync function deprecate(\n  ctx: TestContext,\n  tempFolder: string,\n  packageVersion: string,\n  message: string\n) {\n  debug('deprecating %s with message: %s', packageVersion, message || '(empty, un-deprecate)');\n  const jsonFlag = ctx.adapter.type === 'yarn-modern' ? [] : ['--json'];\n  await ctx.adapter.exec(\n    { cwd: tempFolder },\n    'deprecate',\n    packageVersion,\n    message,\n    ...jsonFlag,\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n  debug('deprecate command completed for %s', packageVersion);\n}\n\nasync function getInfo(ctx: TestContext, tempFolder: string, pkgName: string) {\n  debug('fetching info for %s', pkgName);\n  const resp = await ctx.adapter.exec(\n    { cwd: tempFolder },\n    'info',\n    pkgName,\n    '--json',\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n  const parsed = JSON.parse(resp.stdout);\n  debug('info for %s: deprecated=%s', pkgName, parsed.deprecated ?? '(not set)');\n  return parsed;\n}\n\nasync function bumpVersion(ctx: TestContext, tempFolder: string) {\n  debug('bumping version (minor) in %s', tempFolder);\n  if (ctx.adapter.type === 'yarn-modern') {\n    // Bump version by editing package.json directly to avoid\n    // requiring the version plugin (not bundled in Yarn 3)\n    const pkgPath = join(tempFolder, 'package.json');\n    const pkg = JSON.parse(await readFile(pkgPath, 'utf8'));\n    const [major, minor, patch] = pkg.version.split('.').map(Number);\n    pkg.version = `${major}.${minor + 1}.${patch}`;\n    debug('bumped %s to %s', pkgPath, pkg.version);\n    await writeFile(pkgPath, JSON.stringify(pkg, null, 2));\n  } else {\n    await ctx.adapter.exec(\n      { cwd: tempFolder },\n      'version',\n      'minor',\n      ...ctx.adapter.registryArg(ctx.registryUrl)\n    );\n  }\n}\n\nasync function prepareDeprecateProject(\n  ctx: TestContext,\n  pkgName: string,\n  version: string\n): Promise<string> {\n  debug('preparing project for %s@%s', pkgName, version);\n  const { tempFolder } = await ctx.adapter.prepareProject(\n    pkgName,\n    version,\n    ctx.registryUrl,\n    ctx.port,\n    ctx.token\n  );\n  if (ctx.adapter.importPlugin) {\n    debug('importing npm-deprecate plugin into %s', tempFolder);\n    await ctx.adapter.importPlugin(tempFolder, 'npm-deprecate');\n  }\n  return tempFolder;\n}\n\nasync function testDeprecate(ctx: TestContext): Promise<void> {\n  const id = ctx.runId;\n\n  const message = 'some message';\n\n  await ctx.subTest('deprecate single version', async () => {\n    const pkgName = `@verdaccio/dep1-${id}`;\n    const tf = await prepareDeprecateProject(ctx, pkgName, '1.0.0');\n    await publishPkg(ctx, tf, pkgName);\n    await deprecate(ctx, tf, `${pkgName}@1.0.0`, message);\n    const info = await getInfo(ctx, tf, pkgName);\n    assert.strictEqual(info.name, pkgName);\n    assert.strictEqual(info.deprecated, message, 'Package should be deprecated');\n  });\n\n  await ctx.subTest('un-deprecate', async () => {\n    const pkgName = `@verdaccio/dep2-${id}`;\n    const tf = await prepareDeprecateProject(ctx, pkgName, '1.0.0');\n    await publishPkg(ctx, tf, pkgName);\n    await deprecate(ctx, tf, `${pkgName}@1.0.0`, message);\n    const info1 = await getInfo(ctx, tf, pkgName);\n    assert.strictEqual(info1.deprecated, message);\n    await deprecate(ctx, tf, `${pkgName}@1.0.0`, '');\n    const info2 = await getInfo(ctx, tf, pkgName);\n    assert.strictEqual(info2.deprecated, undefined, 'Package should be un-deprecated');\n  });\n\n  await ctx.subTest('deprecate multiple versions', async () => {\n    const pkgName = `@verdaccio/dep3-${id}`;\n    const tf = await prepareDeprecateProject(ctx, pkgName, '1.0.0');\n    await publishPkg(ctx, tf, pkgName);\n    for (let i = 0; i < 3; i++) {\n      await bumpVersion(ctx, tf);\n      await publishPkg(ctx, tf, pkgName);\n    }\n    await deprecate(ctx, tf, pkgName, message);\n    for (const v of ['1.0.0', '1.1.0', '1.2.0', '1.3.0']) {\n      const info = await getInfo(ctx, tf, `${pkgName}@${v}`);\n      assert.strictEqual(info.deprecated, message, `Version ${v} should be deprecated`);\n    }\n    await bumpVersion(ctx, tf);\n    await publishPkg(ctx, tf, pkgName);\n    const info = await getInfo(ctx, tf, `${pkgName}@1.4.0`);\n    assert.strictEqual(info.deprecated, undefined, 'New version should not be deprecated');\n  });\n}\n\nexport const deprecateTest: TestDefinition = {\n  name: 'deprecate',\n  requires: ['deprecate'],\n  run: testDeprecate,\n};\n"],"mappings":"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"}

package/build/esm/tests/index.js

@@ -3,6 +3,7 @@ import { deprecateTest } from "./deprecate.js";
 import { distTagsTest } from "./dist-tags.js";
 import { infoTest } from "./info.js";
 import { installTest } from "./install.js";
+import { loginTest } from "./login.js";
 import { pingTest } from "./ping.js";
 import { publishTest } from "./publish.js";
 import { searchTest } from "./search.js";
@@ -16,6 +17,7 @@ var allTests = [
 	infoTest,
 	deprecateTest,
 	distTagsTest,
+	loginTest,
 	pingTest,
 	searchTest,
 	starTest,

package/build/esm/tests/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../src/tests/index.ts"],"sourcesContent":["import { TestDefinition } from '../types';\n\nimport { auditTest } from './audit';\nimport { deprecateTest } from './deprecate';\nimport { distTagsTest } from './dist-tags';\nimport { infoTest } from './info';\nimport { installTest } from './install';\nimport { pingTest } from './ping';\nimport { publishTest } from './publish';\nimport { searchTest } from './search';\nimport { starTest } from './star';\nimport { unpublishTest } from './unpublish';\n\nexport const allTests: TestDefinition[] = [\n  publishTest,\n  installTest,\n  auditTest,\n  infoTest,\n  deprecateTest,\n  distTagsTest,\n  pingTest,\n  searchTest,\n  starTest,\n  unpublishTest,\n];\n\nexport {\n  publishTest,\n  installTest,\n  auditTest,\n  infoTest,\n  deprecateTest,\n  distTagsTest,\n  pingTest,\n  searchTest,\n  starTest,\n  unpublishTest,\n};\n"],"mappings":";;;;;;;;;;;AAaA,IAAa,WAA6B;CACxC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACD"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../src/tests/index.ts"],"sourcesContent":["import { TestDefinition } from '../types';\n\nimport { auditTest } from './audit';\nimport { deprecateTest } from './deprecate';\nimport { distTagsTest } from './dist-tags';\nimport { infoTest } from './info';\nimport { installTest } from './install';\nimport { loginTest } from './login';\nimport { pingTest } from './ping';\nimport { publishTest } from './publish';\nimport { searchTest } from './search';\nimport { starTest } from './star';\nimport { unpublishTest } from './unpublish';\n\nexport const allTests: TestDefinition[] = [\n  publishTest,\n  installTest,\n  auditTest,\n  infoTest,\n  deprecateTest,\n  distTagsTest,\n  loginTest,\n  pingTest,\n  searchTest,\n  starTest,\n  unpublishTest,\n];\n\nexport {\n  publishTest,\n  installTest,\n  auditTest,\n  infoTest,\n  deprecateTest,\n  distTagsTest,\n  loginTest,\n  pingTest,\n  searchTest,\n  starTest,\n  unpublishTest,\n};\n"],"mappings":";;;;;;;;;;;;AAcA,IAAa,WAA6B;CACxC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACD"}

package/build/esm/tests/login.js

@@ -0,0 +1,113 @@
+import { createTempFolder, getPackageJSON, getREADME } from "../utils/project.js";
+import buildDebug from "debug";
+import { join } from "path";
+import { writeFile } from "fs/promises";
+import YAML from "js-yaml";
+import assert from "assert";
+//#region src/tests/login.ts
+var debug = buildDebug("verdaccio:e2e-cli:test:login");
+/**
+* Creates a project with registry config but WITHOUT auth token,
+* so whoami will use the token saved by login to ~/.yarnrc.yml.
+*/
+async function prepareLoginProject(ctx, name) {
+	debug("preparing project for %s (no auth token)", name);
+	const tempFolder = await createTempFolder(name);
+	const yamlContent = YAML.dump({
+		npmRegistryServer: ctx.registryUrl,
+		enableImmutableInstalls: false,
+		unsafeHttpWhitelist: ["localhost"]
+	});
+	await writeFile(join(tempFolder, ".yarnrc.yml"), yamlContent);
+	await writeFile(join(tempFolder, "package.json"), JSON.stringify({
+		name,
+		version: "1.0.0"
+	}));
+	if (ctx.adapter.importPlugin) {
+		debug("importing npm-login plugin into %s", tempFolder);
+		await ctx.adapter.importPlugin(tempFolder, "npm-login");
+	}
+	return tempFolder;
+}
+async function yarnLogin(ctx, cwd, user, password, email) {
+	debug("yarn npm login as %s", user);
+	return ctx.adapter.exec({ cwd }, "login", "--auth-type=legacy", `--user=${user}`, `--password=${password}`, `--email=${email}`);
+}
+async function yarnWhoami(ctx, cwd) {
+	const resp = await ctx.adapter.exec({ cwd }, "whoami");
+	debug("yarn npm whoami: %s", resp.stdout);
+	return resp.stdout;
+}
+async function testLogin(ctx) {
+	const type = ctx.adapter.type;
+	const id = ctx.runId;
+	if (type !== "yarn-modern") {
+		debug("login test only supported for yarn-modern, skipping %s", type);
+		return;
+	}
+	const user1 = `login-a-${id}`;
+	const password1 = "test-password-123";
+	const email1 = `${user1}@test.example.com`;
+	await ctx.subTest("create new user + whoami", async () => {
+		const tf = await prepareLoginProject(ctx, `verdaccio-login1-${id}`);
+		const loginResp = await yarnLogin(ctx, tf, user1, password1, email1);
+		assert.ok(loginResp.stdout.includes("Logged in") || loginResp.stdout.includes("token saved"), `Expected login success message but got "${loginResp.stdout}"`);
+		const who = await yarnWhoami(ctx, tf);
+		assert.ok(who.includes(user1), `Expected whoami "${user1}" but got "${who}"`);
+	});
+	await ctx.subTest("login existing user", async () => {
+		const tf = await prepareLoginProject(ctx, `verdaccio-login2-${id}`);
+		const loginResp = await yarnLogin(ctx, tf, user1, password1, email1);
+		assert.ok(loginResp.stdout.includes("Logged in") || loginResp.stdout.includes("token saved"), `Expected login success for existing user but got "${loginResp.stdout}"`);
+		const who = await yarnWhoami(ctx, tf);
+		assert.ok(who.includes(user1), `Expected "${user1}" but got "${who}"`);
+	});
+	await ctx.subTest("wrong password fails", async () => {
+		const tf = await prepareLoginProject(ctx, `verdaccio-login3-${id}`);
+		let loginFailed = false;
+		try {
+			await yarnLogin(ctx, tf, user1, "wrong-password", email1);
+		} catch {
+			loginFailed = true;
+		}
+		assert.ok(loginFailed, "Login with wrong password should have failed");
+	});
+	await ctx.subTest("login then publish", async () => {
+		const pkgName = `@verdaccio/login-pub-${id}`;
+		const tf = await createTempFolder(`login-pub-${id}`);
+		const yamlContent = YAML.dump({
+			npmRegistryServer: ctx.registryUrl,
+			enableImmutableInstalls: false,
+			unsafeHttpWhitelist: ["localhost"]
+		});
+		await writeFile(join(tf, ".yarnrc.yml"), yamlContent);
+		await writeFile(join(tf, "package.json"), getPackageJSON(pkgName, "1.0.0"));
+		await writeFile(join(tf, "README.md"), getREADME(pkgName));
+		if (ctx.adapter.importPlugin) await ctx.adapter.importPlugin(tf, "npm-login");
+		await yarnLogin(ctx, tf, user1, password1, email1);
+		await ctx.adapter.exec({ cwd: tf }, "install");
+		const pubResp = await ctx.adapter.exec({ cwd: tf }, "publish");
+		assert.ok(pubResp.stdout.includes("Package archive published"), `Expected publish success but got "${pubResp.stdout}"`);
+	});
+	await ctx.subTest("switch users", async () => {
+		const user2 = `login-b-${id}`;
+		const password2 = "other-password-456";
+		const email2 = `${user2}@test.example.com`;
+		const tf = await prepareLoginProject(ctx, `verdaccio-login5-${id}`);
+		await yarnLogin(ctx, tf, user1, password1, email1);
+		const who1 = await yarnWhoami(ctx, tf);
+		assert.ok(who1.includes(user1), `Expected "${user1}" but got "${who1}"`);
+		await yarnLogin(ctx, tf, user2, password2, email2);
+		const who2 = await yarnWhoami(ctx, tf);
+		assert.ok(who2.includes(user2), `Expected "${user2}" after switch but got "${who2}"`);
+	});
+}
+var loginTest = {
+	name: "login",
+	requires: ["login"],
+	run: testLogin
+};
+//#endregion
+export { loginTest };
+
+//# sourceMappingURL=login.js.map

package/build/esm/tests/login.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"login.js","names":[],"sources":["../../../src/tests/login.ts"],"sourcesContent":["import assert from 'assert';\nimport buildDebug from 'debug';\nimport { writeFile } from 'fs/promises';\nimport { join } from 'path';\nimport YAML from 'js-yaml';\n\nimport { TestContext, TestDefinition } from '../types';\nimport { createTempFolder, getPackageJSON, getREADME } from '../utils/project';\n\nconst debug = buildDebug('verdaccio:e2e-cli:test:login');\n\n/**\n * Creates a project with registry config but WITHOUT auth token,\n * so whoami will use the token saved by login to ~/.yarnrc.yml.\n */\nasync function prepareLoginProject(\n  ctx: TestContext,\n  name: string\n): Promise<string> {\n  debug('preparing project for %s (no auth token)', name);\n  const tempFolder = await createTempFolder(name);\n  const yamlContent = YAML.dump({\n    npmRegistryServer: ctx.registryUrl,\n    enableImmutableInstalls: false,\n    unsafeHttpWhitelist: ['localhost'],\n  });\n  await writeFile(join(tempFolder, '.yarnrc.yml'), yamlContent);\n  await writeFile(join(tempFolder, 'package.json'), JSON.stringify({ name, version: '1.0.0' }));\n  if (ctx.adapter.importPlugin) {\n    debug('importing npm-login plugin into %s', tempFolder);\n    await ctx.adapter.importPlugin(tempFolder, 'npm-login');\n  }\n  return tempFolder;\n}\n\nasync function yarnLogin(\n  ctx: TestContext,\n  cwd: string,\n  user: string,\n  password: string,\n  email: string\n) {\n  debug('yarn npm login as %s', user);\n  return ctx.adapter.exec(\n    { cwd },\n    'login',\n    '--auth-type=legacy',\n    `--user=${user}`,\n    `--password=${password}`,\n    `--email=${email}`\n  );\n}\n\nasync function yarnWhoami(ctx: TestContext, cwd: string): Promise<string> {\n  const resp = await ctx.adapter.exec({ cwd }, 'whoami');\n  debug('yarn npm whoami: %s', resp.stdout);\n  return resp.stdout;\n}\n\nasync function testLogin(ctx: TestContext): Promise<void> {\n  const type = ctx.adapter.type;\n  const id = ctx.runId;\n\n  if (type !== 'yarn-modern') {\n    debug('login test only supported for yarn-modern, skipping %s', type);\n    return;\n  }\n\n  const user1 = `login-a-${id}`;\n  const password1 = 'test-password-123';\n  const email1 = `${user1}@test.example.com`;\n\n  await ctx.subTest('create new user + whoami', async () => {\n    const tf = await prepareLoginProject(ctx, `verdaccio-login1-${id}`);\n    const loginResp = await yarnLogin(ctx, tf, user1, password1, email1);\n    assert.ok(\n      loginResp.stdout.includes('Logged in') || loginResp.stdout.includes('token saved'),\n      `Expected login success message but got \"${loginResp.stdout}\"`\n    );\n    const who = await yarnWhoami(ctx, tf);\n    assert.ok(who.includes(user1), `Expected whoami \"${user1}\" but got \"${who}\"`);\n  });\n\n  await ctx.subTest('login existing user', async () => {\n    const tf = await prepareLoginProject(ctx, `verdaccio-login2-${id}`);\n    const loginResp = await yarnLogin(ctx, tf, user1, password1, email1);\n    assert.ok(\n      loginResp.stdout.includes('Logged in') || loginResp.stdout.includes('token saved'),\n      `Expected login success for existing user but got \"${loginResp.stdout}\"`\n    );\n    const who = await yarnWhoami(ctx, tf);\n    assert.ok(who.includes(user1), `Expected \"${user1}\" but got \"${who}\"`);\n  });\n\n  await ctx.subTest('wrong password fails', async () => {\n    const tf = await prepareLoginProject(ctx, `verdaccio-login3-${id}`);\n    let loginFailed = false;\n    try {\n      await yarnLogin(ctx, tf, user1, 'wrong-password', email1);\n    } catch {\n      loginFailed = true;\n    }\n    assert.ok(loginFailed, 'Login with wrong password should have failed');\n  });\n\n  await ctx.subTest('login then publish', async () => {\n    const pkgName = `@verdaccio/login-pub-${id}`;\n    const tf = await createTempFolder(`login-pub-${id}`);\n    const yamlContent = YAML.dump({\n      npmRegistryServer: ctx.registryUrl,\n      enableImmutableInstalls: false,\n      unsafeHttpWhitelist: ['localhost'],\n    });\n    await writeFile(join(tf, '.yarnrc.yml'), yamlContent);\n    await writeFile(join(tf, 'package.json'), getPackageJSON(pkgName, '1.0.0'));\n    await writeFile(join(tf, 'README.md'), getREADME(pkgName));\n    if (ctx.adapter.importPlugin) {\n      await ctx.adapter.importPlugin(tf, 'npm-login');\n    }\n    await yarnLogin(ctx, tf, user1, password1, email1);\n    await ctx.adapter.exec({ cwd: tf }, 'install');\n    const pubResp = await ctx.adapter.exec({ cwd: tf }, 'publish');\n    assert.ok(\n      pubResp.stdout.includes('Package archive published'),\n      `Expected publish success but got \"${pubResp.stdout}\"`\n    );\n  });\n\n  await ctx.subTest('switch users', async () => {\n    const user2 = `login-b-${id}`;\n    const password2 = 'other-password-456';\n    const email2 = `${user2}@test.example.com`;\n    const tf = await prepareLoginProject(ctx, `verdaccio-login5-${id}`);\n\n    await yarnLogin(ctx, tf, user1, password1, email1);\n    const who1 = await yarnWhoami(ctx, tf);\n    assert.ok(who1.includes(user1), `Expected \"${user1}\" but got \"${who1}\"`);\n\n    await yarnLogin(ctx, tf, user2, password2, email2);\n    const who2 = await yarnWhoami(ctx, tf);\n    assert.ok(who2.includes(user2), `Expected \"${user2}\" after switch but got \"${who2}\"`);\n  });\n}\n\nexport const loginTest: TestDefinition = {\n  name: 'login',\n  requires: ['login'],\n  run: testLogin,\n};\n"],"mappings":"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"}

package/build/esm/tests/ping.js

@@ -1,9 +1,21 @@
 import assert from "assert";
 //#region src/tests/ping.ts
 async function testPing(ctx) {
-	const resp = await ctx.adapter.exec({}, "ping", "--json", ...ctx.adapter.registryArg(ctx.registryUrl));
-	const parsedBody = JSON.parse(resp.stdout);
-	assert.strictEqual(parsedBody.registry, ctx.registryUrl + "/", `Expected registry "${ctx.registryUrl}/" but got "${parsedBody.registry}"`);
+	const type = ctx.adapter.type;
+	const needsProject = type === "yarn-modern";
+	let cwd;
+	if (needsProject) {
+		const { tempFolder } = await ctx.adapter.prepareProject(`verdaccio-ping-${ctx.runId}`, "1.0.0", ctx.registryUrl, ctx.port, ctx.token);
+		cwd = tempFolder;
+		if (ctx.adapter.importPlugin) await ctx.adapter.importPlugin(tempFolder, "npm-ping");
+	}
+	const jsonFlag = type === "yarn-modern" ? [] : ["--json"];
+	const resp = await ctx.adapter.exec({ cwd }, "ping", ...jsonFlag, ...ctx.adapter.registryArg(ctx.registryUrl));
+	if (type === "yarn-modern") assert.ok(true, "ping succeeded");
+	else {
+		const parsedBody = JSON.parse(resp.stdout);
+		assert.strictEqual(parsedBody.registry, ctx.registryUrl + "/", `Expected registry "${ctx.registryUrl}/" but got "${parsedBody.registry}"`);
+	}
 }
 var pingTest = {
 	name: "ping",

package/build/esm/tests/ping.js.map

@@ -1 +1 @@
-{"version":3,"file":"ping.js","names":[],"sources":["../../../src/tests/ping.ts"],"sourcesContent":["import assert from 'assert';\n\nimport { TestContext, TestDefinition } from '../types';\n\nasync function testPing(ctx: TestContext): Promise<void> {\n  const resp = await ctx.adapter.exec(\n    {},\n    'ping',\n    '--json',\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n  const parsedBody = JSON.parse(resp.stdout);\n  assert.strictEqual(\n    parsedBody.registry,\n    ctx.registryUrl + '/',\n    `Expected registry \"${ctx.registryUrl}/\" but got \"${parsedBody.registry}\"`\n  );\n}\n\nexport const pingTest: TestDefinition = {\n  name: 'ping',\n  requires: ['ping'],\n  run: testPing,\n};\n"],"mappings":";;AAIA,eAAe,SAAS,KAAiC;CACvD,MAAM,OAAO,MAAM,IAAI,QAAQ,KAC7B,EAAE,EACF,QACA,UACA,GAAG,IAAI,QAAQ,YAAY,IAAI,YAAY,CAC5C;CACD,MAAM,aAAa,KAAK,MAAM,KAAK,OAAO;AAC1C,QAAO,YACL,WAAW,UACX,IAAI,cAAc,KAClB,sBAAsB,IAAI,YAAY,cAAc,WAAW,SAAS,GACzE;;AAGH,IAAa,WAA2B;CACtC,MAAM;CACN,UAAU,CAAC,OAAO;CAClB,KAAK;CACN"}
+{"version":3,"file":"ping.js","names":[],"sources":["../../../src/tests/ping.ts"],"sourcesContent":["import assert from 'assert';\n\nimport { TestContext, TestDefinition } from '../types';\n\nasync function testPing(ctx: TestContext): Promise<void> {\n  const type = ctx.adapter.type;\n  const needsProject = type === 'yarn-modern';\n  let cwd: string | undefined;\n\n  if (needsProject) {\n    const { tempFolder } = await ctx.adapter.prepareProject(\n      `verdaccio-ping-${ctx.runId}`,\n      '1.0.0',\n      ctx.registryUrl,\n      ctx.port,\n      ctx.token\n    );\n    cwd = tempFolder;\n    if (ctx.adapter.importPlugin) {\n      await ctx.adapter.importPlugin(tempFolder, 'npm-ping');\n    }\n  }\n\n  const jsonFlag = type === 'yarn-modern' ? [] : ['--json'];\n  const resp = await ctx.adapter.exec(\n    { cwd },\n    'ping',\n    ...jsonFlag,\n    ...ctx.adapter.registryArg(ctx.registryUrl)\n  );\n\n  if (type === 'yarn-modern') {\n    // yarn npm ping succeeding (exit code 0) is sufficient proof the registry is reachable\n    assert.ok(true, 'ping succeeded');\n  } else {\n    const parsedBody = JSON.parse(resp.stdout);\n    assert.strictEqual(\n      parsedBody.registry,\n      ctx.registryUrl + '/',\n      `Expected registry \"${ctx.registryUrl}/\" but got \"${parsedBody.registry}\"`\n    );\n  }\n}\n\nexport const pingTest: TestDefinition = {\n  name: 'ping',\n  requires: ['ping'],\n  run: testPing,\n};\n"],"mappings":";;AAIA,eAAe,SAAS,KAAiC;CACvD,MAAM,OAAO,IAAI,QAAQ;CACzB,MAAM,eAAe,SAAS;CAC9B,IAAI;AAEJ,KAAI,cAAc;EAChB,MAAM,EAAE,eAAe,MAAM,IAAI,QAAQ,eACvC,kBAAkB,IAAI,SACtB,SACA,IAAI,aACJ,IAAI,MACJ,IAAI,MACL;AACD,QAAM;AACN,MAAI,IAAI,QAAQ,aACd,OAAM,IAAI,QAAQ,aAAa,YAAY,WAAW;;CAI1D,MAAM,WAAW,SAAS,gBAAgB,EAAE,GAAG,CAAC,SAAS;CACzD,MAAM,OAAO,MAAM,IAAI,QAAQ,KAC7B,EAAE,KAAK,EACP,QACA,GAAG,UACH,GAAG,IAAI,QAAQ,YAAY,IAAI,YAAY,CAC5C;AAED,KAAI,SAAS,cAEX,QAAO,GAAG,MAAM,iBAAiB;MAC5B;EACL,MAAM,aAAa,KAAK,MAAM,KAAK,OAAO;AAC1C,SAAO,YACL,WAAW,UACX,IAAI,cAAc,KAClB,sBAAsB,IAAI,YAAY,cAAc,WAAW,SAAS,GACzE;;;AAIL,IAAa,WAA2B;CACtC,MAAM;CACN,UAAU,CAAC,OAAO;CAClB,KAAK;CACN"}

package/build/esm/utils/registry-client.js

@@ -1,5 +1,5 @@
 import buildDebug from "debug";
-import got from "got";
+import { ping } from "@verdaccio/registry-cli";
 //#region src/utils/registry-client.ts
 var debug = buildDebug("verdaccio:e2e-cli:registry-client");
 /**
@@ -10,21 +10,20 @@ var debug = buildDebug("verdaccio:e2e-cli:registry-client");
 async function createUser(registryUrl, user = `e2e-user-${Date.now()}`, password = "e2e-test-password") {
 	debug("creating user %s on %s", user, registryUrl);
 	const url = `${registryUrl}/-/user/org.couchdb.user:${encodeURIComponent(user)}`;
-	const response = await got.put(url, {
-		json: {
+	const response = await fetch(url, {
+		method: "PUT",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify({
 			name: user,
 			password,
 			_id: `org.couchdb.user:${user}`,
 			type: "user",
 			roles: [],
 			date: (/* @__PURE__ */ new Date()).toISOString()
-		},
-		responseType: "json",
-		throwHttpErrors: false,
-		retry: { limit: 0 }
+		})
 	});
-	const body = response.body;
-	if (response.statusCode === 201 || response.statusCode === 200 || response.statusCode === 409) {
+	const body = await response.json();
+	if (response.status === 201 || response.status === 200 || response.status === 409) {
 		const token = body.token;
 		if (token) {
 			debug("user %s authenticated, token obtained", user);
@@ -34,19 +33,16 @@ async function createUser(registryUrl, user = `e2e-user-${Date.now()}`, password
 			};
 		}
 	}
-	throw new Error(`Failed to create/login user "${user}" on ${registryUrl}: ${response.statusCode} ${JSON.stringify(body)}`);
+	throw new Error(`Failed to create/login user "${user}" on ${registryUrl}: ${response.status} ${JSON.stringify(body)}`);
 }
 /**
 * Ping the registry to check it's alive.
+* Uses @verdaccio/registry-cli ping.
 */
 async function pingRegistry(registryUrl) {
 	debug("pinging %s", registryUrl);
 	try {
-		return (await got.get(`${registryUrl}/-/ping`, {
-			throwHttpErrors: false,
-			retry: { limit: 2 },
-			timeout: { request: 5e3 }
-		})).statusCode === 200;
+		return (await ping(registryUrl)).ok;
 	} catch {
 		return false;
 	}

package/build/esm/utils/registry-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry-client.js","names":[],"sources":["../../../src/utils/registry-client.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport got from 'got';\n\nconst debug = buildDebug('verdaccio:e2e-cli:registry-client');\n\nexport type RegistryAuth = {\n  token: string;\n  user: string;\n};\n\n/**\n * Creates a user on the registry and returns the auth token.\n * Uses a unique username per run to avoid 409 conflicts.\n * Works against any running Verdaccio instance with htpasswd auth.\n */\nexport async function createUser(\n  registryUrl: string,\n  user = `e2e-user-${Date.now()}`,\n  password = 'e2e-test-password'\n): Promise<RegistryAuth> {\n  debug('creating user %s on %s', user, registryUrl);\n  const url = `${registryUrl}/-/user/org.couchdb.user:${encodeURIComponent(user)}`;\n  const response = await got.put(url, {\n    json: {\n      name: user,\n      password,\n      _id: `org.couchdb.user:${user}`,\n      type: 'user',\n      roles: [],\n      date: new Date().toISOString(),\n    },\n    responseType: 'json',\n    throwHttpErrors: false,\n    retry: { limit: 0 },\n  });\n\n  const body = response.body as any;\n\n  // 409 = user already exists, the PUT still returns a token (login)\n  if (response.statusCode === 201 || response.statusCode === 200 || response.statusCode === 409) {\n    const token = body.token;\n    if (token) {\n      debug('user %s authenticated, token obtained', user);\n      return { token, user };\n    }\n  }\n\n  throw new Error(\n    `Failed to create/login user \"${user}\" on ${registryUrl}: ${response.statusCode} ${JSON.stringify(body)}`\n  );\n}\n\n/**\n * Ping the registry to check it's alive.\n */\nexport async function pingRegistry(registryUrl: string): Promise<boolean> {\n  debug('pinging %s', registryUrl);\n  try {\n    const response = await got.get(`${registryUrl}/-/ping`, {\n      throwHttpErrors: false,\n      retry: { limit: 2 },\n      timeout: { request: 5000 },\n    });\n    return response.statusCode === 200;\n  } catch {\n    return false;\n  }\n}\n"],"mappings":";;;AAGA,IAAM,QAAQ,WAAW,oCAAoC;;;;;;AAY7D,eAAsB,WACpB,aACA,OAAO,YAAY,KAAK,KAAK,IAC7B,WAAW,qBACY;AACvB,OAAM,0BAA0B,MAAM,YAAY;CAClD,MAAM,MAAM,GAAG,YAAY,2BAA2B,mBAAmB,KAAK;CAC9E,MAAM,WAAW,MAAM,IAAI,IAAI,KAAK;EAClC,MAAM;GACJ,MAAM;GACN;GACA,KAAK,oBAAoB;GACzB,MAAM;GACN,OAAO,EAAE;GACT,uBAAM,IAAI,MAAM,EAAC,aAAa;GAC/B;EACD,cAAc;EACd,iBAAiB;EACjB,OAAO,EAAE,OAAO,GAAG;EACpB,CAAC;CAEF,MAAM,OAAO,SAAS;AAGtB,KAAI,SAAS,eAAe,OAAO,SAAS,eAAe,OAAO,SAAS,eAAe,KAAK;EAC7F,MAAM,QAAQ,KAAK;AACnB,MAAI,OAAO;AACT,SAAM,yCAAyC,KAAK;AACpD,UAAO;IAAE;IAAO;IAAM;;;AAI1B,OAAM,IAAI,MACR,gCAAgC,KAAK,OAAO,YAAY,IAAI,SAAS,WAAW,GAAG,KAAK,UAAU,KAAK,GACxG;;;;;AAMH,eAAsB,aAAa,aAAuC;AACxE,OAAM,cAAc,YAAY;AAChC,KAAI;AAMF,UALiB,MAAM,IAAI,IAAI,GAAG,YAAY,UAAU;GACtD,iBAAiB;GACjB,OAAO,EAAE,OAAO,GAAG;GACnB,SAAS,EAAE,SAAS,KAAM;GAC3B,CAAC,EACc,eAAe;SACzB;AACN,SAAO"}
+{"version":3,"file":"registry-client.js","names":[],"sources":["../../../src/utils/registry-client.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { ping } from '@verdaccio/registry-cli';\n\nconst debug = buildDebug('verdaccio:e2e-cli:registry-client');\n\nexport type RegistryAuth = {\n  token: string;\n  user: string;\n};\n\n/**\n * Creates a user on the registry and returns the auth token.\n * Uses a unique username per run to avoid 409 conflicts.\n * Works against any running Verdaccio instance with htpasswd auth.\n */\nexport async function createUser(\n  registryUrl: string,\n  user = `e2e-user-${Date.now()}`,\n  password = 'e2e-test-password'\n): Promise<RegistryAuth> {\n  debug('creating user %s on %s', user, registryUrl);\n  const url = `${registryUrl}/-/user/org.couchdb.user:${encodeURIComponent(user)}`;\n  const response = await fetch(url, {\n    method: 'PUT',\n    headers: { 'Content-Type': 'application/json' },\n    body: JSON.stringify({\n      name: user,\n      password,\n      _id: `org.couchdb.user:${user}`,\n      type: 'user',\n      roles: [],\n      date: new Date().toISOString(),\n    }),\n  });\n\n  const body = (await response.json()) as any;\n\n  if (response.status === 201 || response.status === 200 || response.status === 409) {\n    const token = body.token;\n    if (token) {\n      debug('user %s authenticated, token obtained', user);\n      return { token, user };\n    }\n  }\n\n  throw new Error(\n    `Failed to create/login user \"${user}\" on ${registryUrl}: ${response.status} ${JSON.stringify(body)}`\n  );\n}\n\n/**\n * Ping the registry to check it's alive.\n * Uses @verdaccio/registry-cli ping.\n */\nexport async function pingRegistry(registryUrl: string): Promise<boolean> {\n  debug('pinging %s', registryUrl);\n  try {\n    const result = await ping(registryUrl);\n    return result.ok;\n  } catch {\n    return false;\n  }\n}\n"],"mappings":";;;AAGA,IAAM,QAAQ,WAAW,oCAAoC;;;;;;AAY7D,eAAsB,WACpB,aACA,OAAO,YAAY,KAAK,KAAK,IAC7B,WAAW,qBACY;AACvB,OAAM,0BAA0B,MAAM,YAAY;CAClD,MAAM,MAAM,GAAG,YAAY,2BAA2B,mBAAmB,KAAK;CAC9E,MAAM,WAAW,MAAM,MAAM,KAAK;EAChC,QAAQ;EACR,SAAS,EAAE,gBAAgB,oBAAoB;EAC/C,MAAM,KAAK,UAAU;GACnB,MAAM;GACN;GACA,KAAK,oBAAoB;GACzB,MAAM;GACN,OAAO,EAAE;GACT,uBAAM,IAAI,MAAM,EAAC,aAAa;GAC/B,CAAC;EACH,CAAC;CAEF,MAAM,OAAQ,MAAM,SAAS,MAAM;AAEnC,KAAI,SAAS,WAAW,OAAO,SAAS,WAAW,OAAO,SAAS,WAAW,KAAK;EACjF,MAAM,QAAQ,KAAK;AACnB,MAAI,OAAO;AACT,SAAM,yCAAyC,KAAK;AACpD,UAAO;IAAE;IAAO;IAAM;;;AAI1B,OAAM,IAAI,MACR,gCAAgC,KAAK,OAAO,YAAY,IAAI,SAAS,OAAO,GAAG,KAAK,UAAU,KAAK,GACpG;;;;;;AAOH,eAAsB,aAAa,aAAuC;AACxE,OAAM,cAAc,YAAY;AAChC,KAAI;AAEF,UADe,MAAM,KAAK,YAAY,EACxB;SACR;AACN,SAAO"}

package/build/reporter.d.ts

@@ -1,6 +1,7 @@
 import { SuiteResult, TestResult } from './types';
 export declare function reportTestStart(adapterName: string, testName: string): void;
-export declare function reportTestResult(result: TestResult): void;
+export declare function reportTestResult(result: TestResult, hasSubTests?: boolean): void;
 export declare function reportSuiteStart(adapterName: string): void;
+export declare function reportSubTestResult(label: string, passed: boolean, duration?: number): void;
 export declare function reportSkipped(testName: string): void;
 export declare function reportSummary(results: SuiteResult[]): void;

package/build/tests/index.d.ts

@@ -4,10 +4,11 @@ import { deprecateTest } from './deprecate';
 import { distTagsTest } from './dist-tags';
 import { infoTest } from './info';
 import { installTest } from './install';
+import { loginTest } from './login';
 import { pingTest } from './ping';
 import { publishTest } from './publish';
 import { searchTest } from './search';
 import { starTest } from './star';
 import { unpublishTest } from './unpublish';
 export declare const allTests: TestDefinition[];
-export { publishTest, installTest, auditTest, infoTest, deprecateTest, distTagsTest, pingTest, searchTest, starTest, unpublishTest, };
+export { publishTest, installTest, auditTest, infoTest, deprecateTest, distTagsTest, loginTest, pingTest, searchTest, starTest, unpublishTest, };

package/build/tests/login.d.ts

@@ -0,0 +1,2 @@
+import { TestDefinition } from '../types';
+export declare const loginTest: TestDefinition;

package/build/types.d.ts

@@ -13,12 +13,21 @@ export type TestContext = {
     adapter: PackageManagerAdapter;
     /** Unique suffix for package names to avoid conflicts across runs */
     runId: string;
+    /** Report a sub-test step. Runs the callback and reports pass/fail. */
+    subTest: (label: string, fn: () => Promise<void>) => Promise<void>;
+};
+export type SubTestResult = {
+    label: string;
+    passed: boolean;
+    duration: number;
+    error?: string;
 };
 export type TestResult = {
     name: string;
     passed: boolean;
     duration: number;
     error?: string;
+    subTests?: SubTestResult[];
 };
 export type SuiteResult = {
     adapter: string;
@@ -53,6 +62,8 @@ export interface PackageManagerAdapter {
     prepareProject(packageName: string, version: string, registryUrl: string, port: number, token: string, dependencies?: Record<string, string>, devDependencies?: Record<string, string>): Promise<{
         tempFolder: string;
     }>;
+    /** Import a Verdaccio yarn plugin into a project (yarn-modern only) */
+    importPlugin?(cwd: string, pluginName: string): Promise<void>;
 }
 export type CliOptions = {
     registry: string;

package/build/utils/registry-client.d.ts

@@ -10,5 +10,6 @@ export type RegistryAuth = {
 export declare function createUser(registryUrl: string, user?: string, password?: string): Promise<RegistryAuth>;
 /**
  * Ping the registry to check it's alive.
+ * Uses @verdaccio/registry-cli ping.
  */
 export declare function pingRegistry(registryUrl: string): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/e2e-cli",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "type": "module",
   "license": "MIT",
   "description": "CLI tool to run Verdaccio e2e tests against any running registry",
@@ -27,9 +27,9 @@
     }
   },
   "dependencies": {
+    "@verdaccio/registry-cli": "^1.1.0",
     "debug": "4.4.0",
     "get-port": "5.1.1",
-    "got": "11.8.6",
     "js-yaml": "4.1.0"
   },
   "devDependencies": {