fix(core): pass client through to init schematic

Use the same client in the generator and schematic for test consistency
nx-dotnet · May 18, 2021 · 5908947 · 5908947
1 parent 96082a1
commit 5908947
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/packages/core/src/generators/init/generator.spec.ts b/packages/core/src/generators/init/generator.spec.ts
@@ -1,33 +1,49 @@
 import { readJson, Tree } from '@nrwl/devkit';
 import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { DotNetClient, mockDotnetFactory } from '@nx-dotnet/dotnet';
 
 import { CONFIG_FILE_PATH, NxDotnetConfig } from '@nx-dotnet/utils';
 
 import generator from './generator';
 
 describe('init generator', () => {
   let appTree: Tree;
+  let dotnetClient: DotNetClient;
 
   beforeEach(() => {
     appTree = createTreeWithEmptyWorkspace();
+    dotnetClient = new DotNetClient(mockDotnetFactory());
   });
 
   it('should create config', async () => {
-    await generator(appTree);
+    await generator(appTree, dotnetClient);
     const config = appTree.isFile(CONFIG_FILE_PATH);
     expect(config).toBeTruthy();
   });
 
   it('should update gitignore', async () => {
     appTree.write('.gitignore', '');
-    await generator(appTree);
+    await generator(appTree, dotnetClient);
     const gitignoreValue = appTree.read('.gitignore')?.toString();
     expect(gitignoreValue).toBeTruthy();
   });
 
   it('should put dependency array inside config', async () => {
-    await generator(appTree);
+    await generator(appTree, dotnetClient);
     const config: NxDotnetConfig = readJson(appTree, CONFIG_FILE_PATH);
     expect(config.nugetPackages).toBeDefined();
   });
+
+  it('should create tool manifest', async () => {
+    const spy = spyOn(dotnetClient, 'new');
+    await generator(appTree, dotnetClient);
+    expect(spy).toHaveBeenCalledWith('tool-manifest');
+  });
+
+  it('should not create tool manifest if it exists', async () => {
+    appTree.write('.config/dotnet-tools.json', '');
+    const spy = spyOn(dotnetClient, 'new');
+    await generator(appTree, dotnetClient);
+    expect(spy).not.toHaveBeenCalled();
+  });
 });
diff --git a/packages/core/src/generators/utils/generate-project.spec.ts b/packages/core/src/generators/utils/generate-project.spec.ts
@@ -33,7 +33,7 @@ describe('nx-dotnet project generator', () => {
   });
 
   afterEach(async () => {
-    await Promise.all([rimraf('apps'), rimraf('libs')]);
+    await Promise.all([rimraf('apps'), rimraf('libs'), rimraf('.config')]);
   });
 
   it('should run successfully for libraries', async () => {

diff --git a/packages/core/src/generators/utils/generate-project.ts b/packages/core/src/generators/utils/generate-project.ts
@@ -176,7 +176,7 @@ export async function GenerateProject(
   dotnetClient: DotNetClient,
   projectType: ProjectType,
 ) {
-  await initSchematic(host);
+  await initSchematic(host, dotnetClient);
 
   options.testTemplate = options.testTemplate ?? 'none';