test(generators): improve and add new tests

Author: jgw96

src/generators/util.spec.ts

@@ -5,6 +5,7 @@ import * as helpers from '../util/helpers';
 import * as globUtils from '../util/glob-util';
 import * as util from './util';
 import * as GeneratorConstants from './constants';
+import * as TypeScriptUtils from '../util/typescript-utils';
 
 describe('util', () => {
   describe('hydrateRequest', () => {
@@ -406,13 +407,26 @@ $TAB_CONTENT
     });
 
     it('should return a succesful promise', () => {
-      let rejected = false;
+      // set up spies
+      spyOn(helpers, helpers.readFileAsync.name).and.returnValue(Promise.resolve('file content'));
+      spyOn(fs, 'readdirSync').and.returnValue([
+        '/path/to/nowhere',
+        'path/to/somewhere'
+      ]);
+      spyOn(helpers, helpers.writeFileAsync.name).and.returnValue(Promise.resolve());
+      spyOn(helpers, helpers.mkDirpAsync.name).and.returnValue(Promise.resolve());
+      spyOn(TypeScriptUtils, TypeScriptUtils.insertNamedImportIfNeeded.name).and.returnValue('file content');
+      spyOn(TypeScriptUtils, TypeScriptUtils.appendNgModuleDeclaration.name).and.returnValue('sliced string');
 
-      util.nonPageFileManipulation(context, 'coolStuff', '/src/pages/cool-tab-one/cool-tab-one.module.ts', 'pipe').catch(() => {
-        rejected = true;
-      });
+      // what we want to test
+      const promise = util.nonPageFileManipulation(context, 'coolStuff', '/src/pages/cool-tab-one/cool-tab-one.module.ts', 'pipe');
 
-      expect(rejected).toBeFalsy();
+      // test
+      return promise.then((value: string[]) => {
+        expect(helpers.readFileAsync).toHaveBeenCalled();
+        expect(helpers.writeFileAsync).toHaveBeenCalled();
+        expect(helpers.mkDirpAsync).toHaveBeenCalled();
+      });
     });
 
     it('should throw when files are not written succesfully', () => {

src/util/typescript-utils.spec.ts

@@ -121,4 +121,29 @@ export class TacoBellModule {}
       }
     });
   });
+
+  describe('insertNamedImportIfNeeded', () => {
+    it('should return modified file content, which is a string', () => {
+      const filePath = '/path/to/my/file';
+      const fileContent = 'import {A, B, C} from modulePath';
+      const namedImport = 'NamedImport';
+      const fromModule = 'CoolModule';
+
+      const result = tsUtils.insertNamedImportIfNeeded(filePath, fileContent, namedImport, fromModule);
+
+      // TODO: figure out how to match the exact string
+      expect(result).toEqual(jasmine.any(String));
+    });
+  });
+
+  it('should return the same file content as the import is already in the file', () => {
+    const filePath = '/path/to/my/file';
+    const fileContent = 'import { A } from "modulePath"';
+    const namedImport = 'A';
+    const fromModule = `modulePath`;
+
+    const result = tsUtils.insertNamedImportIfNeeded(filePath, fileContent, namedImport, fromModule);
+
+    expect(result).toEqual(fileContent);
+  });
 });