test: cleanup and convert acceptance tests to TypeScript

Author: Charles Lyding

package.json

@@ -54,7 +54,7 @@
     "exports-loader": "^0.6.3",
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.10.0",
-    "fs-extra": "~2.0.0",
+    "fs-extra": "~3.0.1",
     "get-caller-file": "^1.0.0",
     "glob": "^7.0.3",
     "html-webpack-plugin": "^2.19.0",
@@ -109,7 +109,7 @@
     "@types/common-tags": "^1.2.4",
     "@types/denodeify": "^1.2.29",
     "@types/express": "^4.0.32",
-    "@types/fs-extra": "0.0.37",
+    "@types/fs-extra": "~3.0.2",
     "@types/glob": "^5.0.29",
     "@types/jasmine": "~2.2.0",
     "@types/lodash": "4.14.50",
@@ -125,7 +125,6 @@
     "conventional-changelog": "^1.1.0",
     "dtsgenerator": "^0.9.1",
     "eslint": "^3.11.0",
-    "exists-sync": "0.0.4",
     "express": "^4.14.0",
     "jasmine": "^2.4.1",
     "jasmine-spec-reporter": "^3.2.0",
@@ -138,7 +137,6 @@
     "request": "^2.74.0",
     "resolve-bin": "^0.4.0",
     "rewire": "^2.5.1",
-    "sinon": "^1.17.3",
     "spdx-satisfies": "^0.1.3",
     "through": "^2.3.6",
     "tree-kill": "^1.0.0",

tests/acceptance/destroy.spec.js renamed to tests/acceptance/destroy.spec.ts

@@ -1,9 +1,8 @@
-'use strict';
+import { expect } from 'chai';
 
 const ng = require('../helpers/ng');
 const tmp = require('../helpers/tmp');
 const SilentError = require('silent-error');
-const expect = require('chai').expect;
 
 describe('Acceptance: ng destroy', function () {
   beforeEach(function () {
@@ -22,15 +21,15 @@ describe('Acceptance: ng destroy', function () {
   it('without args should fail', function () {
     return ng(['destroy']).then(() => {
       throw new SilentError('ng destroy should fail.');
-    }, (err) => {
+    }, (err: any) => {
       expect(err.message).to.equal('The destroy command is not supported by Angular CLI.');
     });
   });
 
   it('with args should fail', function () {
     return ng(['destroy', 'something']).then(() => {
       throw new SilentError('ng destroy something should fail.');
-    }, (err) => {
+    }, (err: any) => {
       expect(err.message).to.equal('The destroy command is not supported by Angular CLI.');
     });
   });

tests/acceptance/dynamic-path-parser.spec.js renamed to tests/acceptance/dynamic-path-parser.spec.ts

@@ -1,20 +1,18 @@
-'use strict';
+import { expect } from 'chai';
+import * as path from 'path';
+import { dynamicPathParser } from '@angular/cli/utilities/dynamic-path-parser';
+import mockFs = require('mock-fs');
 
-var expect = require('chai').expect;
-var path = require('path');
-var dynamicPathParser = require('../../packages/@angular/cli/utilities/dynamic-path-parser').dynamicPathParser;
-var mockFs = require('mock-fs');
-
-var appDir = `src${path.sep}app`;
+const appDir = `src${path.sep}app`;
 const appConfig = {
   root: 'src'
 };
 
 describe('dynamic path parser', () => {
-  var project;
-  var entityName = 'temp-name';
-  var rootName = path.parse(process.cwd()).root + 'project';
-  var root = 'src';
+  let project: any;
+  const entityName = 'temp-name';
+  const rootName = path.parse(process.cwd()).root + 'project';
+  const root = 'src';
   beforeEach(() => {
     project = {
       root: rootName,
@@ -24,7 +22,7 @@ describe('dynamic path parser', () => {
         }]
       }
     };
-    var mockFolder = {};
+    const mockFolder: any = {};
     mockFolder[rootName] = {
       src: {
         app: {
@@ -42,58 +40,58 @@ describe('dynamic path parser', () => {
 
   it('parse from proj root dir', () => {
     process.env.PWD = project.root;
-    var options = {
+    const options = {
       project,
       entityName,
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it('parse from proj src dir', () => {
     process.env.PWD = path.join(project.root, 'src');
-    var options = {
+    const options = {
       project,
       entityName,
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client dir`, () => {
     process.env.PWD = path.join(project.root, 'src', 'client');
-    var options = {
+    const options = {
       project,
       entityName,
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client${path.sep}app dir`, () => {
     process.env.PWD = path.join(project.root, 'src', 'client', 'app');
-    var options = {
+    const options = {
       project,
       entityName,
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir`, () => {
-    var mockFolder = {};
+    const mockFolder: any = {};
     mockFolder[rootName] = {
       src: {
         app: {
@@ -106,19 +104,20 @@ describe('dynamic path parser', () => {
     };
     mockFs(mockFolder);
     process.env.PWD = path.join(project.root, 'src', 'app', 'child-dir');
-    var options = {
+    const options = {
       project,
       entityName,
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
     expect(result.name).to.equal(entityName);
   });
 
+  // tslint:disable-next-line:max-line-length
   it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir w/ ..${path.sep}`, () => {
-    var mockFolder = {};
+    const mockFolder: any = {};
     mockFolder[rootName] = {
       src: {
         app: {
@@ -130,20 +129,21 @@ describe('dynamic path parser', () => {
     };
     mockFs(mockFolder);
     process.env.PWD = path.join(project.root, 'src', 'app', 'child-dir');
-    var options = {
+    const options = {
       project,
       entityName: '..' + path.sep + entityName,
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);    
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
+  // tslint:disable-next-line:max-line-length
   it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir${path.sep}grand-child-dir w/ ..${path.sep}`,
     () => {
-      var mockFolder = {};
+      const mockFolder: any = {};
       mockFolder[rootName] = {
         src: {
           app: {
@@ -157,19 +157,19 @@ describe('dynamic path parser', () => {
       };
       mockFs(mockFolder);
       process.env.PWD = path.join(project.root, 'src', 'app', 'child-dir', 'grand-child-dir');
-      var options = {
+      const options = {
         project,
         entityName: '..' + path.sep + entityName,
         appConfig,
         dryRun: false
       };
-      var result = dynamicPathParser(options);
+      const result = dynamicPathParser(options);
       expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
       expect(result.name).to.equal(entityName);
     });
 
   it('auto look for dirs with a "+" when not specified', () => {
-    var mockFolder = {};
+    const mockFolder: any = {};
     mockFolder[rootName] = {
       src: {
         app: {
@@ -179,26 +179,26 @@ describe('dynamic path parser', () => {
     };
     mockFs(mockFolder);
     process.env.PWD = path.join(project.root, 'src', 'app', 'my-route');
-    var options = {
+    const options = {
       project,
       entityName,
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(`${appDir}${path.sep}+my-route`);
     expect(result.name).to.equal(entityName);
   });
 
   it('create new dirs as dasherized', () => {
     process.env.PWD = project.root;
-    var options = {
+    const options = {
       project,
       entityName: path.join('NewDir', entityName),
       appConfig,
       dryRun: false
     };
-    var result = dynamicPathParser(options);
+    const result = dynamicPathParser(options);
     expect(result.dir).to.equal(`${appDir}${path.sep}new-dir`);
     expect(result.name).to.equal(entityName);
   });

tests/acceptance/generate-class.spec.js renamed to tests/acceptance/generate-class.spec.ts

@@ -1,11 +1,10 @@
-'use strict';
+import * as fs from 'fs-extra';
+import { expect } from 'chai';
+import * as path from 'path';
 
 const ng = require('../helpers/ng');
 const tmp = require('../helpers/tmp');
 
-const existsSync = require('exists-sync');
-const expect = require('chai').expect;
-const path = require('path');
 const root = process.cwd();
 
 const testPath = path.join(root, 'tmp', 'foo', 'src', 'app');
@@ -26,21 +25,21 @@ describe('Acceptance: ng generate class', function () {
 
   it('ng generate class my-class', function () {
     return ng(['generate', 'class', 'my-class']).then(() => {
-      expect(existsSync(path.join(testPath, 'my-class.ts'))).to.equal(true);
-      expect(existsSync(path.join(testPath, 'my-class.spec.ts'))).to.equal(false);
+      expect(fs.pathExistsSync(path.join(testPath, 'my-class.ts'))).to.equal(true);
+      expect(fs.pathExistsSync(path.join(testPath, 'my-class.spec.ts'))).to.equal(false);
     });
   });
 
   it('ng generate class my-class --no-spec', function () {
     return ng(['generate', 'class', 'my-class', '--no-spec']).then(() => {
-      expect(existsSync(path.join(testPath, 'my-class.ts'))).to.equal(true);
-      expect(existsSync(path.join(testPath, 'my-class.spec.ts'))).to.equal(false);
+      expect(fs.pathExistsSync(path.join(testPath, 'my-class.ts'))).to.equal(true);
+      expect(fs.pathExistsSync(path.join(testPath, 'my-class.spec.ts'))).to.equal(false);
     });
   });
 
   it('ng generate class my-class.model', function () {
     return ng(['generate', 'class', 'my-class.model']).then(() => {
-      expect(existsSync(path.join(testPath, 'my-class.model.ts'))).to.equal(true);
+      expect(fs.pathExistsSync(path.join(testPath, 'my-class.model.ts'))).to.equal(true);
     });
   });
 });