test: migrate the rest of the test

Author: dianjuar

packages/ngx-deploy-npm-e2e/src/install.spec.ts

@@ -0,0 +1,80 @@
+import { TargetConfiguration } from '@nx/devkit';
+import { uniq } from '@nx/plugin/testing';
+
+import { DeployExecutorOptions } from 'bikecoders/ngx-deploy-npm';
+import { npmAccess } from 'bikecoders/ngx-deploy-npm';
+import { setup } from './utils';
+
+describe('install', () => {
+  const expectedTarget = ({
+    projectName,
+    isBuildable = true,
+    access = npmAccess.public,
+    customDistFolderPath,
+  }: {
+    projectName: string;
+    isBuildable?: boolean;
+    access?: npmAccess;
+    customDistFolderPath?: string;
+  }): TargetConfiguration<DeployExecutorOptions> => {
+    const target: TargetConfiguration<DeployExecutorOptions> = {
+      executor: 'ngx-deploy-npm:deploy',
+      options: {
+        distFolderPath: customDistFolderPath || `dist/packages/${projectName}`,
+        access,
+      },
+    };
+
+    if (isBuildable) {
+      target.dependsOn = ['build'];
+    }
+
+    return target;
+  };
+
+  it('should modify the workspace only for the indicated libs', async () => {
+    const { processedLibs, tearDown } = await setup([
+      { name: uniq('node-lib1'), generator: '@nx/node' },
+      { name: uniq('node-lib2'), generator: '@nx/node' },
+      {
+        name: uniq('node-resctricted'),
+        installOptions: {
+          access: npmAccess.restricted,
+        },
+        generator: '@nx/node',
+      },
+      {
+        name: uniq('node-lib-not-set'),
+        skipInstall: true,
+        generator: '@nx/node',
+      },
+      { name: uniq('small-lib'), generator: 'minimal' },
+    ]);
+    const [publicLib, publicLib2, restrictedLib, libNOTSet, smallLib] =
+      processedLibs;
+
+    expect(publicLib.workspace.targets?.deploy).toEqual(
+      expectedTarget({ projectName: publicLib.name })
+    );
+    expect(publicLib2.workspace.targets?.deploy).toEqual(
+      expectedTarget({ projectName: publicLib2.name })
+    );
+    expect(restrictedLib.workspace.targets?.deploy).toEqual(
+      expectedTarget({
+        projectName: restrictedLib.name,
+        access: npmAccess.restricted,
+      })
+    );
+    expect(libNOTSet.workspace.targets?.deploy).toEqual(undefined);
+
+    expect(smallLib.workspace.targets?.deploy).toEqual(
+      expectedTarget({
+        projectName: smallLib.name,
+        customDistFolderPath: smallLib.workspace.sourceRoot,
+        isBuildable: false,
+      })
+    );
+
+    return tearDown();
+  }, 120000);
+});

packages/ngx-deploy-npm-e2e/src/publish-minimal-lib.spec.ts

@@ -9,10 +9,11 @@ describe('Minimal Project', () => {
     const [uniqLibName] = processedLibs;
 
     executeCommand(
-      `npx nx deploy ${uniqLibName.name} --tag e2e --registry=http://localhost:4873`
+      `npx nx deploy ${uniqLibName.name} --tag="e2e" --registry=http://localhost:4873 --packageVersion=0.0.0`
     );
 
     expect(() => {
+      executeCommand(`npm view ${uniqLibName.npmPackageName}@0.0.0`);
       executeCommand(`npm view ${uniqLibName.npmPackageName}@e2e`);
     }).not.toThrow();
 

packages/ngx-deploy-npm-e2e/src/publish.spec.ts

@@ -0,0 +1,36 @@
+import { uniq } from '@nx/plugin/testing';
+import { setup } from './utils';
+
+describe('Publish', () => {
+  test.each([
+    {
+      name: uniq('angular-lib'),
+      generator: '@nx/angular',
+      extraOptions: '--style css',
+    },
+    {
+      name: uniq('node-lib'),
+      generator: '@nx/node',
+    },
+  ])(
+    'should publish with $generator lib',
+    async libConfig => {
+      const { executeCommand, tearDown, processedLibs } = await setup([
+        libConfig,
+      ]);
+      const [lib] = processedLibs;
+
+      executeCommand(
+        `npx nx deploy ${lib.name} --registry=http://localhost:4873 --tag="e2e" --packageVersion=0.0.0`
+      );
+
+      expect(() => {
+        executeCommand(`npm view ${lib.npmPackageName}@0.0.0`);
+        executeCommand(`npm view ${lib.npmPackageName}@e2e`);
+      }).not.toThrow();
+
+      return tearDown();
+    },
+    120000 * 2
+  );
+});

packages/ngx-deploy-npm-e2e/src/utils/basic-setup.ts

@@ -14,7 +14,7 @@ import {
   installNgxDeployNPMProject,
 } from '.';
 
-const mockDomian = '@mock-domain';
+const buildPackageProjectRoot = (libName: string) => `packages/${libName}`;
 
 const executeCommandFactory =
   (projectDirectory: string) => (command: string) => {
@@ -76,7 +76,9 @@ export const setup = async (
           nxPlugin: generator,
           executeCommand,
           libName: name,
-          extraOptions: `--directory="libs/${name}" ${extraOptions}`,
+          extraOptions: `--directory="${buildPackageProjectRoot(
+            name
+          )}" ${extraOptions}`,
         });
       }
     })
@@ -99,8 +101,8 @@ export const setup = async (
 
       const distFolderPath =
         generator === 'minimal'
-          ? getMinimalLibRoot(projectDirectory, name).libRoot
-          : `dist/libs/${name}`;
+          ? buildPackageProjectRoot(name)
+          : `dist/${buildPackageProjectRoot(name)}`;
 
       installNgxDeployNPMProject(
         executeCommand,
@@ -114,8 +116,12 @@ export const setup = async (
     npmPackageName: string;
   }[] = libs.map(({ name }) => ({
     name: name,
-    workspace: readJson(`${projectDirectory}/packages/${name}/project.json`),
-    npmPackageName: `${mockDomian}/${name}`,
+    workspace: readJson(
+      `${projectDirectory}/${buildPackageProjectRoot(name)}/project.json`
+    ),
+    npmPackageName: readJson(
+      `${projectDirectory}/${buildPackageProjectRoot(name)}/package.json`
+    ).name,
   }));
 
   return {
@@ -133,19 +139,13 @@ export const setup = async (
   };
 };
 
-function getMinimalLibRoot(projectDirectory: string, libName: string) {
-  const libRoot = `packages/${libName}`;
-  const libRootAbsolutePath = join(projectDirectory, libRoot);
-
-  return { libRoot, libRootAbsolutePath };
-}
-
 async function createMinimalLib(projectDirectory: string, libName: string) {
   // Create Lib
-  const { libRoot, libRootAbsolutePath } = getMinimalLibRoot(
+  const libRootAbsolutePath = join(
     projectDirectory,
-    libName
+    buildPackageProjectRoot(libName)
   );
+  const libRoot = buildPackageProjectRoot(libName);
 
   // Create the lib folder
   await fs.promises.mkdir(libRootAbsolutePath, {
@@ -188,7 +188,7 @@ async function createMinimalLib(projectDirectory: string, libName: string) {
 
   function generatePackageJSON(projectName: string): string {
     const content = {
-      name: `${mockDomian}/${projectName}`,
+      name: `@mock-domain/${projectName}`,
       description: 'Minimal LIb',
       version: '1.0.0',
     };

packages/ngx-deploy-npm-e2e/src/utils/get-nx-current-version.ts

@@ -1,3 +1,4 @@
-import packageJson from '../../../../package.json'; // This import style requires "esModuleInterop", see "side notes"
+import { readJson } from '@nx/plugin/testing';
 
-export const currentNxVersion = packageJson.devDependencies['@nx/workspace'];
+export const currentNxVersion = readJson(`${process.cwd()}/package.json`)
+  .devDependencies['@nx/workspace'];

packages/ngx-deploy-npm-e2e/tsconfig.spec.json

@@ -3,9 +3,7 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"],
-    "resolveJsonModule": true,
-    "esModuleInterop": true
+    "types": ["jest", "node"]
   },
   "include": [
     "jest.config.ts",

packages/ngx-deploy-npm/src/__mocks__/mocks.ts

@@ -12,7 +12,7 @@ export const getLib = (libName: string): ProjectConfiguration => {
         executor: '@mocks/compiler:rollup',
         outputs: ['{options.outputPath}'],
         options: {
-          outputPath: `dist/libs/${libName}`,
+          outputPath: `dist/packages/${libName}`,
         },
       },
       ...mockLintTarget,

packages/ngx-deploy-npm/src/executors/deploy/actions.spec.ts

@@ -31,7 +31,7 @@ describe('Deploy', () => {
   it('should invoke the engine', async () => {
     const { mockEngine, context } = setup();
     const options: DeployExecutorOptions = {
-      distFolderPath: 'dist/libs/project',
+      distFolderPath: 'dist/packages/project',
       access: 'public',
     };
 

packages/ngx-deploy-npm/src/index.ts

@@ -1 +1,3 @@
 export type { InstallGeneratorOptions } from './generators/install/schema';
+export type { DeployExecutorOptions } from './executors/deploy/schema';
+export { npmAccess } from './core/npm-access.enum';