acceptance tests

Author: hansl

lib/bootstrap-local.js

@@ -53,6 +53,12 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
   Module._load = function (request, parent) {
     if (request in packages) {
       return oldLoad.call(this, packages[request].main, parent);
+    } else if (request.startsWith('angular-cli/')) {
+      // We allow deep imports (for now).
+      // TODO: move tests to inside angular-cli package so they don't have to deep import.
+      const dir = path.dirname(parent.filename);
+      const newRequest = path.relative(dir, path.join(__dirname, '../packages', request));
+      return oldLoad.call(this, newRequest, parent);
     } else {
       return oldLoad.apply(this, arguments);
     }

lib/packages.js

@@ -9,7 +9,8 @@ const packages = fs.readdirSync(packageRoot)
   .map(pkgName => ({ name: pkgName, root: path.join(packageRoot, pkgName) }))
   .filter(pkg => fs.statSync(pkg.root).isDirectory())
   .reduce((packages, pkg) => {
-    packages[`@angular-cli/${pkg.name}`] = {
+    let name = pkg == 'angular-cli' ? 'angular-cli' : `@angular-cli/${pkg.name}`;
+    packages[name] = {
       root: pkg.root,
       main: path.resolve(pkg.root, 'src/index.ts')
     };

tests/acceptance/dynamic-path-parser.spec.js

@@ -2,7 +2,7 @@
 
 var expect = require('chai').expect;
 var path = require('path');
-var dynamicPathParser = require('../../addon/ng2/utilities/dynamic-path-parser');
+var dynamicPathParser = require('../../packages/angular-cli/utilities/dynamic-path-parser');
 var mockFs = require('mock-fs');
 
 var appDir = `src${path.sep}app`;

tests/acceptance/init.spec.js

@@ -7,7 +7,7 @@ var glob = require('glob');
 var Blueprint = require('ember-cli/lib/models/blueprint');
 var path = require('path');
 var tmp = require('../helpers/tmp');
-var root = process.cwd();
+var root = path.join(__dirname, '../../packages/angular-cli');
 var util = require('util');
 var conf = require('ember-cli/tests/helpers/conf');
 var minimatch = require('minimatch');
@@ -45,8 +45,8 @@ describe('Acceptance: ng init', function () {
   });
 
   function confirmBlueprinted(isMobile) {
-    var blueprintPath = path.join(root, 'addon', 'ng2', 'blueprints', 'ng2', 'files');
-    var mobileBlueprintPath = path.join(root, 'addon', 'ng2', 'blueprints', 'mobile', 'files');
+    var blueprintPath = path.join(root,  'blueprints', 'ng2', 'files');
+    var mobileBlueprintPath = path.join(root, 'blueprints', 'mobile', 'files');
     var expected = unique(walkSync(blueprintPath).concat(isMobile ? walkSync(mobileBlueprintPath) : []).sort());
     var actual = walkSync('.').sort();
 
@@ -76,7 +76,7 @@ describe('Acceptance: ng init', function () {
   }
 
   function confirmGlobBlueprinted(pattern) {
-    var blueprintPath = path.join(root, 'addon', 'ng2', 'blueprints', 'ng2', 'files');
+    var blueprintPath = path.join(root, 'blueprints', 'ng2', 'files');
     var actual = pickSync('.', pattern);
     var expected = intersect(pickSync(blueprintPath, pattern), actual);
 

tests/acceptance/new.spec.js

@@ -58,7 +58,7 @@ describe('Acceptance: ng new', function () {
   }
 
   function confirmBlueprinted() {
-    return confirmBlueprintedForDir('addon/ng2/blueprints/ng2');
+    return confirmBlueprintedForDir('blueprints/ng2');
   }
 
   it('ng new foo, where foo does not yet exist, works', function () {

tests/helpers/ng.js

@@ -2,7 +2,7 @@
 
 var MockUI = require('./mock-ui');
 var MockAnalytics = require('./mock-analytics');
-var Cli = require('../../lib/cli');
+var Cli = require('angular-cli/lib/cli');
 
 module.exports = function ng(args) {
   var cli;

tsconfig.json

@@ -28,7 +28,7 @@
     }
   },
   "exclude": [
-    "addon/ng2/blueprints/*/files/**/*",
+    "packages/angular-cli/blueprints/*/files/**/*",
     "dist/**/*",
     "node_modules/**/*",
     "tmp/**/*"