add and fix publish tests

Author: gagik

packages/build/src/npm-packages/publish.spec.ts

@@ -8,30 +8,82 @@ describe('npm-packages publishNpmPackages', function () {
   let listNpmPackages: SinonStub;
   let markBumpedFilesAsAssumeUnchanged: SinonStub;
   let spawnSync: SinonStub;
+  const lernaBin = path.resolve(
+    __dirname,
+    '..',
+    '..',
+    '..',
+    '..',
+    'node_modules',
+    '.bin',
+    'lerna'
+  );
 
   beforeEach(function () {
     listNpmPackages = sinon.stub();
     markBumpedFilesAsAssumeUnchanged = sinon.stub();
     spawnSync = sinon.stub();
   });
 
-  it('calls lerna to publish packages for a real version', function () {
-    const lernaBin = path.resolve(
-      __dirname,
-      '..',
-      '..',
-      '..',
-      '..',
-      'node_modules',
-      '.bin',
-      'lerna'
-    );
+  it('throws if mongosh is not existent when publishing all', function () {
     const packages = [{ name: 'packageA', version: '0.7.0' }];
     listNpmPackages.returns(packages);
 
+    expect(() =>
+      publishNpmPackages(
+        { isDryRun: false, useAuxiliaryPackagesOnly: false },
+        listNpmPackages,
+        markBumpedFilesAsAssumeUnchanged,
+        spawnSync
+      )
+    ).throws('mongosh package not found');
+  });
+
+  it('takes mongosh version and pushes tags', function () {
+    const packages = [
+      { name: 'packageA', version: '0.7.0' },
+      { name: 'mongosh', version: '1.2.0' },
+    ];
+    listNpmPackages.returns(packages);
+
+    publishNpmPackages(
+      { isDryRun: false, useAuxiliaryPackagesOnly: false },
+      listNpmPackages,
+      markBumpedFilesAsAssumeUnchanged,
+      spawnSync
+    );
+
+    expect(spawnSync).calledWith('git', ['tag', '-a', '1.2.0', '-m', '1.2.0']);
+    expect(spawnSync).calledWith('git', ['push', '--follow-tags']);
+  });
+
+  it('does not manually push tags with auxiliary packages', function () {
+    const packages = [
+      { name: 'packageA', version: '0.7.0' },
+      { name: 'mongosh', version: '1.2.0' },
+    ];
+    listNpmPackages.returns(packages);
+
+    publishNpmPackages(
+      { isDryRun: false, useAuxiliaryPackagesOnly: true },
+      listNpmPackages,
+      markBumpedFilesAsAssumeUnchanged,
+      spawnSync
+    );
+
+    expect(spawnSync).calledWith('git', ['tag', '-a', '1.2.0', '-m', '1.2.0']);
+    expect(spawnSync).calledWith('git', ['push', '--follow-tags']);
+  });
+
+  it('calls lerna to publish packages for a real version', function () {
+    const packages = [
+      { name: 'packageA', version: '0.7.0' },
+      { name: 'mongosh', version: '1.2.0' },
+    ];
+    listNpmPackages.returns(packages);
+
     publishNpmPackages(
-      false,
-      false,
+      { isDryRun: false, useAuxiliaryPackagesOnly: false },
       listNpmPackages,
       markBumpedFilesAsAssumeUnchanged,
       spawnSync
@@ -48,10 +100,7 @@ describe('npm-packages publishNpmPackages', function () {
         'from-package',
         '--no-private',
         '--no-changelog',
-        '--no-push',
         '--exact',
-        '--no-git-tag-version',
-        '--force-publish',
         '--yes',
         '--no-verify-access',
       ],
@@ -70,8 +119,7 @@ describe('npm-packages publishNpmPackages', function () {
 
     try {
       publishNpmPackages(
-        false,
-        false,
+        { isDryRun: false, useAuxiliaryPackagesOnly: false },
         listNpmPackages,
         markBumpedFilesAsAssumeUnchanged,
         spawnSync

packages/build/src/npm-packages/publish.ts

@@ -11,8 +11,7 @@ import { spawnSync as spawnSyncFn } from '../helpers/spawn-sync';
 import type { SpawnSyncOptionsWithStringEncoding } from 'child_process';
 
 export function publishNpmPackages(
-  isDryRun = false,
-  useAuxiliaryPackagesOnly = false,
+  { isDryRun = false, useAuxiliaryPackagesOnly = false },
   listNpmPackages: typeof listNpmPackagesFn = listNpmPackagesFn,
   markBumpedFilesAsAssumeUnchangedFn: typeof markBumpedFilesAsAssumeUnchanged = markBumpedFilesAsAssumeUnchanged,
   spawnSync: typeof spawnSyncFn = spawnSyncFn
@@ -35,7 +34,7 @@ export function publishNpmPackages(
       (packageConfig) => !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name)
     );
   }
-  // Lerna requires a clean repository for a publish from-package (--force-publish does not have any effect here)
+  // Lerna requires a clean repository for a publish from-package
   // we use git update-index --assume-unchanged on files we know have been bumped
   markBumpedFilesAsAssumeUnchangedFn(packages, true);
   try {
@@ -47,7 +46,6 @@ export function publishNpmPackages(
         '--no-private',
         '--no-changelog',
         '--exact',
-        '--force-publish',
         '--yes',
         '--no-verify-access',
       ],
@@ -63,7 +61,7 @@ export function publishNpmPackages(
     )?.version;
 
     if (!mongoshVersion) {
-      throw new Error('Mongosh package not found');
+      throw new Error('mongosh package not found');
     }
 
     spawnSync(

packages/build/src/run-publish.ts

@@ -81,7 +81,10 @@ export async function runPublish(
   // ensures the segment api key to be present in the published packages
   await writeBuildInfo(config, 'packaged');
 
-  publishNpmPackages(config.isDryRun, config.useAuxiliaryPackagesOnly);
+  publishNpmPackages({
+    isDryRun: config.isDryRun,
+    useAuxiliaryPackagesOnly: config.useAuxiliaryPackagesOnly,
+  });
 
   await publishToHomebrew(
     homebrewCoreGithubRepo,