Better naming, a few more utilities

Author: dfreeman

node-tests/acceptance/build-test.js

@@ -45,6 +45,12 @@ describe('Acceptance: build', function() {
       var foo = exports.foo = 'hello';
     `);
   }));
+
+  it('fails the build when noEmitOnError is set and an error is emitted', co.wrap(function*() {
+    this.app.writeFile('app/app.ts', `import { foo } from 'nonexistent';`);
+
+    yield expect(this.app.build()).to.be.rejectedWith(`Cannot find module 'nonexistent'`);
+  }));
 });
 
 function extractModuleBody(script, moduleName) {

node-tests/helpers/skeleton-app.js

@@ -1,15 +1,16 @@
 'use strict';
 
 const fs = require('fs-extra');
+const path = require('path');
 const mktemp = require('mktemp');
 const execa = require('execa');
 const EventEmitter = require('events').EventEmitter;
 
 module.exports = class SkeletonApp {
   constructor() {
     this._watched = null;
-    this.appDir = mktemp.createDirSync('test-skeleton-app-XXXXXX');
-    fs.copySync(`${__dirname}/../fixtures/skeleton-app`, this.appDir);
+    this.root = mktemp.createDirSync('test-skeleton-app-XXXXXX');
+    fs.copySync(`${__dirname}/../fixtures/skeleton-app`, this.root);
   }
 
   build() {
@@ -24,40 +25,52 @@ module.exports = class SkeletonApp {
     return this._watched = new WatchedBuild(this._ember(['serve']));
   }
 
-  writeFile(path, contents) {
-    fs.writeFileSync(`${this.appDir}/${path}`, contents, 'utf-8');
+  updatePackageJSON(callback) {
+    let pkgPath = `${this.root}/package.json`;
+    let pkg = fs.readJSONSync(pkgPath);
+    fs.writeJSONSync(pkgPath, callback(pkg) || pkg, { spaces: 2 });
+  }
+
+  writeFile(filePath, contents) {
+    let fullPath = `${this.root}/${filePath}`;
+    fs.ensureDirSync(path.dirname(fullPath));
+    fs.writeFileSync(fullPath, contents, 'utf-8');
   }
 
   readFile(path) {
-    return fs.readFileSync(`${this.appDir}/${path}`, 'utf-8');
+    return fs.readFileSync(`${this.root}/${path}`, 'utf-8');
+  }
+
+  removeFile(path) {
+    return fs.unlinkSync(`${this.root}/${path}`);
   }
 
   teardown() {
     if (this._watched) {
       this._watched.kill();
     }
 
-    this._cleanupAppDir({ retries: 1 });
+    this._cleanupRootDir({ retries: 1 });
   }
 
   _ember(args) {
     let ember = require.resolve('ember-cli/bin/ember');
-    return execa('node', [ember].concat(args), { cwd: this.appDir });
+    return execa('node', [ember].concat(args), { cwd: this.root });
   }
 
-  _cleanupAppDir(options) {
+  _cleanupRootDir(options) {
     let retries = options && options.retries || 0;
 
     try {
-      fs.removeSync(this.appDir);
+      fs.removeSync(this.root);
     } catch (error) {
       if (retries > 0) {
         // Windows doesn't necessarily kill the process immediately, so
         // leave a little time before trying to remove the directory.
-        setTimeout(() => this._cleanupAppDir({ retries: retries - 1 }), 250);
+        setTimeout(() => this._cleanupRootDir({ retries: retries - 1 }), 250);
       } else {
         // eslint-disable-next-line no-console
-        console.warn(`Warning: unable to remove skeleton-app tmpdir ${this.appDir} (${error.code})`);
+        console.warn(`Warning: unable to remove skeleton-app tmpdir ${this.root} (${error.code})`);
       }
     }
   }