yeoman-test 1.9.0 → 1.9.1

package/lib/adapter.js

@@ -10,22 +10,22 @@ function DummyPrompt(answers, q) {
   this.question = q;
 }
 
-DummyPrompt.prototype.run = function() {
+DummyPrompt.prototype.run = function () {
   var answer = this.answers[this.question.name];
   var isSet;
 
   switch (this.question.type) {
     case 'list':
-      // List prompt accepts any answer value including null
+      // list prompt accepts any answer value including null
       isSet = answer !== undefined;
       break;
     case 'confirm':
-      // Ensure that we don't replace `false` with default `true`
+      // ensure that we don't replace `false` with default `true`
       isSet = answer || answer === false;
       break;
     default:
-      // Other prompts treat all falsy values to default
-      isSet = Boolean(answer);
+      // other prompts treat all falsy values to default
+      isSet = !!answer;
   }
 
   if (!isSet) {
@@ -43,7 +43,7 @@ function TestAdapter(answers) {
   answers = answers || {};
   this.promptModule = inquirer.createPromptModule();
 
-  Object.keys(this.promptModule.prompts).forEach(function(promptName) {
+  Object.keys(this.promptModule.prompts).forEach(function (promptName) {
     this.promptModule.registerPrompt(promptName, DummyPrompt.bind(DummyPrompt, answers));
   }, this);
 
@@ -51,7 +51,7 @@ function TestAdapter(answers) {
   this.log = sinon.spy();
   _.extend(this.log, events.EventEmitter.prototype);
 
-  // Make sure all log methods are defined
+  // make sure all log methods are defined
   [
     'write',
     'writeln',
@@ -65,12 +65,12 @@ function TestAdapter(answers) {
     'identical',
     'info',
     'table'
-  ].forEach(function(methodName) {
+  ].forEach(function (methodName) {
     this.log[methodName] = sinon.stub().returns(this.log);
   }, this);
 }
 
-TestAdapter.prototype.prompt = function(questions, cb) {
+TestAdapter.prototype.prompt = function (questions, cb) {
   var promise = this.promptModule(questions);
   promise.then(cb || _.noop);
 

package/lib/index.js

@@ -22,9 +22,9 @@ var adapter = require('./adapter');
  * @returns {Function} mocha callback
  */
 
-exports.setUpTestDirectory = function(dir) {
-  return function(done) {
-    exports.testDirectory(dir, function() {
+exports.setUpTestDirectory = function before(dir) {
+  return function (done) {
+    exports.testDirectory(dir, function () {
       exports.gruntfile({ dummy: true }, done);
     });
   };
@@ -46,17 +46,18 @@ exports.setUpTestDirectory = function(dir) {
  *
  */
 
-exports.gruntfile = function(options, done) {
+exports.gruntfile = function (options, done) {
   var config = 'grunt.initConfig(' + JSON.stringify(options, null, 2) + ');';
 
-  config = config
-    .split('\n')
-    .map(function(line) {
-      return '  ' + line;
-    })
-    .join('\n');
+  config = config.split('\n').map(function (line) {
+    return '  ' + line;
+  }).join('\n');
 
-  var out = ['module.exports = function (grunt) {', config, '};'];
+  var out = [
+    'module.exports = function (grunt) {',
+    config,
+    '};'
+  ];
 
   fs.writeFile('Gruntfile.js', out.join('\n'), done);
 };
@@ -72,7 +73,7 @@ exports.gruntfile = function(options, done) {
  * });
  */
 
-exports.testDirectory = function(dir, cb) {
+exports.testDirectory = function (dir, cb) {
   if (!dir) {
     throw new Error('Missing directory');
   }
@@ -83,7 +84,7 @@ exports.testDirectory = function(dir, cb) {
   // test dir after cleaning up, this shouldn't be perceivable.
   process.chdir('/');
 
-  rimraf(dir, function(err) {
+  rimraf(dir, function (err) {
     if (err) {
       return cb(err);
     }
@@ -104,12 +105,12 @@ exports.testDirectory = function(dir, cb) {
  * mockPrompt(angular, {'bootstrap': 'Y', 'compassBoostrap': 'Y'});
  */
 
-exports.mockPrompt = function(generator, answers) {
+exports.mockPrompt = function (generator, answers) {
   var promptModule = generator.env.adapter.promptModule;
   answers = answers || {};
   var DummyPrompt = adapter.DummyPrompt;
 
-  Object.keys(promptModule.prompts).forEach(function(name) {
+  Object.keys(promptModule.prompts).forEach(function (name) {
     promptModule.registerPrompt(name, DummyPrompt.bind(DummyPrompt, answers));
   });
 };
@@ -118,7 +119,7 @@ exports.mockPrompt = function(generator, answers) {
  * Restore defaults prompts on a generator.
  * @param {Generator} generator
  */
-exports.restorePrompt = function(generator) {
+exports.restorePrompt = function (generator) {
   generator.env.adapter.promptModule.restoreDefaultPrompts();
 };
 
@@ -127,7 +128,7 @@ exports.restorePrompt = function(generator) {
  * @param  {Generator} generator - a Yeoman generator
  * @param  {Object} localConfig - localConfig - should look just like if called config.getAll()
  */
-exports.mockLocalConfig = function(generator, localConfig) {
+exports.mockLocalConfig = function (generator, localConfig) {
   generator.config.defaults(localConfig);
 };
 
@@ -135,12 +136,11 @@ exports.mockLocalConfig = function(generator, localConfig) {
  * Create a simple, dummy generator
  */
 
-exports.createDummyGenerator = () =>
-  class extends Generator {
-    test() {
-      this.shouldRun = true;
-    }
-  };
+exports.createDummyGenerator = () => class extends Generator {
+  test() {
+    this.shouldRun = true;
+  }
+};
 
 /**
  * Create a generator, using the given dependencies and controller arguments
@@ -161,7 +161,7 @@ exports.createDummyGenerator = () =>
  * var angular = createGenerator('angular:app', deps);
  */
 
-exports.createGenerator = function(name, dependencies, args, options) {
+exports.createGenerator = function (name, dependencies, args, options) {
   var env = yeoman.createEnv();
   this.registerDependencies(env, dependencies);
 
@@ -175,8 +175,8 @@ exports.createGenerator = function(name, dependencies, args, options) {
  * @param {Array} dependencies - paths to the generators dependencies
  */
 
-exports.registerDependencies = function(env, dependencies) {
-  dependencies.forEach(function(dependency) {
+exports.registerDependencies = function (env, dependencies) {
+  dependencies.forEach(function (dependency) {
     if (_.isArray(dependency)) {
       env.registerStub.apply(env, dependency);
     } else {
@@ -191,7 +191,7 @@ exports.registerDependencies = function(env, dependencies) {
  * @return {RunContext}
  */
 
-exports.run = function(GeneratorOrNamespace, settings) {
+exports.run = function (GeneratorOrNamespace, settings) {
   var RunContext = require('./run-context');
   return new RunContext(GeneratorOrNamespace, settings);
 };

package/lib/run-context.js

@@ -26,7 +26,7 @@ var TestAdapter = require('./adapter').TestAdapter;
  * @return {this}
  */
 
-function RunContext(Generator, settings) {
+var RunContext = module.exports = function RunContext(Generator, settings) {
   this._asyncHolds = 0;
   this.ran = false;
   this.inDirSet = false;
@@ -43,7 +43,8 @@ function RunContext(Generator, settings) {
     skipInstall: true
   });
   setTimeout(this._run.bind(this), 10);
-}
+};
+
 util.inherits(RunContext, EventEmitter);
 
 /**
@@ -51,10 +52,10 @@ util.inherits(RunContext, EventEmitter);
  * @return {Function} Callback to notify the normal execution can resume
  */
 
-RunContext.prototype.async = function() {
+RunContext.prototype.async = function () {
   this._asyncHolds++;
 
-  return function() {
+  return function () {
     this._asyncHolds--;
     this._run();
   }.bind(this);
@@ -65,7 +66,7 @@ RunContext.prototype.async = function() {
  * @private
  */
 
-RunContext.prototype._run = function() {
+RunContext.prototype._run = function () {
   if (!this.inDirSet && this.settings.tmpdir) {
     this.inTmpDir();
   }
@@ -95,64 +96,53 @@ RunContext.prototype._run = function() {
 
   helpers.mockPrompt(this.generator, this.answers);
 
-  if (this.localConfig) {
-    // Only mock local config when withLocalConfig was called
+  if (this.localConfig) { // only mock local config when withLocalConfig was called
     helpers.mockLocalConfig(this.generator, this.localConfig);
   }
 
-  this.generator.on(
-    'error',
-    function(err) {
-      if (!this.emit('error', err)) {
-        throw err;
-      }
-    }.bind(this)
-  );
-  this.generator.once(
-    'end',
-    function() {
-      helpers.restorePrompt(this.generator);
-      this.emit('end');
-      this.completed = true;
-    }.bind(this)
-  );
+  this.generator.on('error', function (err) {
+    if (!this.emit('error', err)) {
+      throw err;
+    }
+  }.bind(this));
+  this.generator.once('end', function () {
+    helpers.restorePrompt(this.generator);
+    this.emit('end');
+    this.completed = true;
+  }.bind(this));
 
   this.emit('ready', this.generator);
-  this.generator.run().catch(err => this.emit('error', err));
+  this.generator.run();
 };
 
 /**
  * Return a promise representing the generator run process
  * @return {Promise} Promise resolved on end or rejected on error
  */
-RunContext.prototype.toPromise = function() {
-  return new Promise(
-    function(resolve, reject) {
-      this.on(
-        'end',
-        function() {
-          resolve(this.targetDirectory);
-        }.bind(this)
-      );
-      this.on('error', reject);
-    }.bind(this)
-  );
+RunContext.prototype.toPromise = function () {
+  return new Promise(function (resolve, reject) {
+    this.on('end', function () {
+      resolve(this.targetDirectory);
+    }.bind(this));
+    this.on('error', reject);
+  }.bind(this));
 };
 
 /**
  * Promise `.then()` duck typing
  * @return {Promise}
  */
-RunContext.prototype.then = function() {
+RunContext.prototype.then = function () {
   var promise = this.toPromise();
   return promise.then.apply(promise, arguments);
 };
 
+
 /**
  * Promise `.catch()` duck typing
  * @return {Promise}
  */
-RunContext.prototype.catch = function() {
+RunContext.prototype.catch = function () {
   var promise = this.toPromise();
   return promise.catch.apply(promise, arguments);
 };
@@ -165,7 +155,7 @@ RunContext.prototype.catch = function() {
  * @return {this} run context instance
  */
 
-RunContext.prototype.inDir = function(dirPath, cb) {
+RunContext.prototype.inDir = function (dirPath, cb) {
   this.inDirSet = true;
   this.targetDirectory = dirPath;
   var release = this.async();
@@ -183,7 +173,7 @@ RunContext.prototype.inDir = function(dirPath, cb) {
  *                            file path for predictable results
  * @return {this} run context instance
  */
-RunContext.prototype.cd = function(dirPath) {
+RunContext.prototype.cd = function (dirPath) {
   this.inDirSet = true;
   this.targetDirectory = dirPath;
   dirPath = path.resolve(dirPath);
@@ -204,7 +194,7 @@ RunContext.prototype.cd = function(dirPath) {
  * @param {Function} [cb] - callback who'll receive the folder path as argument
  * @return {this} run context instance
  */
-RunContext.prototype.inTmpDir = function(cb) {
+RunContext.prototype.inTmpDir = function (cb) {
   var tmpdir = path.join(os.tmpdir(), crypto.randomBytes(20).toString('hex'));
   return this.inDir(tmpdir, cb);
 };
@@ -212,7 +202,7 @@ RunContext.prototype.inTmpDir = function(cb) {
 /**
  * Clean the directory used for tests inside inDir/inTmpDir
  */
-RunContext.prototype.cleanTestDirectory = function() {
+RunContext.prototype.cleanTestDirectory = function () {
   if (this.targetDirectory) {
     rimraf.sync(this.targetDirectory);
   }
@@ -224,12 +214,9 @@ RunContext.prototype.cleanTestDirectory = function() {
  * @return {this}
  */
 
-RunContext.prototype.withArguments = function(args) {
+RunContext.prototype.withArguments = function (args) {
   var argsArray = _.isString(args) ? args.split(' ') : args;
-  assert(
-    _.isArray(argsArray),
-    'args should be either a string separated by spaces or an array'
-  );
+  assert(_.isArray(argsArray), 'args should be either a string separated by spaces or an array');
   this.args = this.args.concat(argsArray);
   return this;
 };
@@ -240,10 +227,10 @@ RunContext.prototype.withArguments = function(args) {
  * @return {this}
  */
 
-RunContext.prototype.withOptions = function(options) {
+RunContext.prototype.withOptions = function (options) {
   // Add options as both kebab and camel case. This is to stay backward compatibles with
   // the switch we made to meow for options parsing.
-  Object.keys(options).forEach(function(key) {
+  Object.keys(options).forEach(function (key) {
     options[_.camelCase(key)] = options[key];
     options[_.kebabCase(key)] = options[key];
   });
@@ -258,7 +245,7 @@ RunContext.prototype.withOptions = function(options) {
  * @return {this}
  */
 
-RunContext.prototype.withPrompts = function(answers) {
+RunContext.prototype.withPrompts = function (answers) {
   this.answers = _.extend(this.answers, answers);
   return this;
 };
@@ -280,7 +267,7 @@ RunContext.prototype.withPrompts = function(answers) {
  * });
  */
 
-RunContext.prototype.withGenerators = function(dependencies) {
+RunContext.prototype.withGenerators = function (dependencies) {
   assert(_.isArray(dependencies), 'dependencies should be an array');
   this.dependencies = this.dependencies.concat(dependencies);
   return this;
@@ -291,10 +278,8 @@ RunContext.prototype.withGenerators = function(dependencies) {
  * @param  {Object} localConfig - should look just like if called config.getAll()
  * @return {this}
  */
-RunContext.prototype.withLocalConfig = function(localConfig) {
+RunContext.prototype.withLocalConfig = function (localConfig) {
   assert(_.isObject(localConfig), 'config should be an object');
   this.localConfig = localConfig;
   return this;
 };
-
-module.exports = RunContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-test",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Test utilities for Yeoman generators",
   "homepage": "http://yeoman.io/authoring/testing.html",
   "author": "The Yeoman Team",
@@ -13,43 +13,30 @@
     "unit test"
   ],
   "repository": "yeoman/yeoman-test",
-  "license": "MIT",
   "devDependencies": {
-    "coveralls": "^3.0.2",
-    "eslint": "^5.2.0",
-    "eslint-config-prettier": "^2.4.0",
-    "eslint-config-xo": "^0.23.0",
-    "eslint-plugin-prettier": "^2.2.0",
-    "husky": "^0.14.3",
-    "lint-staged": "^7.2.0",
-    "mocha": "^5.2.0",
-    "nyc": "^12.0.2",
-    "prettier": "^1.7.0"
+    "eslint": "^4.2.0",
+    "gulp": "^4.0.0",
+    "gulp-coveralls": "^0.1.0",
+    "gulp-eslint": "^4.0.0",
+    "gulp-exclude-gitignore": "^1.0.0",
+    "gulp-istanbul": "^1.1.2",
+    "gulp-mocha": "^5.0.0",
+    "gulp-nsp": "^3.0.1",
+    "gulp-plumber": "^1.0.0"
+  },
+  "scripts": {
+    "prepublish": "gulp prepublish",
+    "test": "gulp"
   },
+  "license": "MIT",
   "dependencies": {
-    "inquirer": "^6.0.0",
+    "inquirer": "^5.2.0",
     "lodash": "^4.17.10",
     "mkdirp": "^0.5.1",
     "pinkie-promise": "^2.0.1",
     "rimraf": "^2.4.4",
-    "sinon": "^6.1.4",
+    "sinon": "^5.0.7",
     "yeoman-environment": "^2.3.0",
-    "yeoman-generator": "^3.1.1"
-  },
-  "scripts": {
-    "test": "nyc mocha",
-    "pretest": "eslint .",
-    "precommit": "lint-staged",
-    "coverage": "nyc report --reporter=text-lcov | coveralls"
-  },
-  "lint-staged": {
-    "*.js": [
-      "eslint --fix",
-      "git add"
-    ],
-    "*.json": [
-      "prettier --write",
-      "git add"
-    ]
+    "yeoman-generator": "^2.0.5"
   }
 }