chore(gen): update yeoman-test to 1.4.0, use toPromise

angular-fullstack · May 4, 2016 · 4863f7c · 4863f7c
1 parent 6666ddb
commit 4863f7c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "shelljs": "^0.6.0",
     "should": "^8.3.1",
     "yeoman-assert": "^2.0.0",
-    "yeoman-test": "^1.3.0"
+    "yeoman-test": "^1.4.0"
   },
   "engines": {
     "node": "^5.10.1",

diff --git a/src/test/test-helpers.js b/src/test/test-helpers.js
@@ -91,41 +91,36 @@ export function readJSON(path) {
 export function runGen(prompts, opts={}) {
   let options = opts.options || {skipInstall: true};
 
-  return new Promise((resolve, reject) => {
-    let dir;
-    let gen = helpers
-      .run(require.resolve('../generators/app'))
-      .inTmpDir(function(_dir) {
-        // this will create a new temporary directory for each new generator run
-        var done = this.async();
-        if(DEBUG) console.log(`TEMP DIR: ${_dir}`);
-        dir = _dir;
-
-        let promises = [
-          fs.mkdirAsync(dir + '/client').then(() => {
-            return fs.symlinkAsync(__dirname + '/fixtures/bower_components', dir + '/client/bower_components');
-          }),
-          fs.symlinkAsync(__dirname + '/fixtures/node_modules', dir + '/node_modules')
-        ];
-
-        if(opts.copyConfigFile) {
-          promises.push(copyAsync(path.join(TEST_DIR, 'fixtures/.yo-rc.json'), path.join(dir, '.yo-rc.json')));
-        }
-
-        // symlink our dependency directories
-        return Promise.all(promises).then(done);
-      })
-      .withGenerators([
-        require.resolve('../generators/endpoint'),
-        // [helpers.createDummyGenerator(), 'ng-component:app']
-      ])
-      // .withArguments(['upperCaseBug'])
-      .withOptions(options);
-
-    if(prompts) gen.withPrompts(prompts);
-
-    gen
-      .on('error', reject)
-      .on('end', () => resolve(dir));
-  });
+  // let dir;
+  let gen = helpers
+    .run(require.resolve('../generators/app'))
+    .inTmpDir(function(dir) {
+      // this will create a new temporary directory for each new generator run
+      var done = this.async();
+      if(DEBUG) console.log(`TEMP DIR: ${dir}`);
+
+      let promises = [
+        fs.mkdirAsync(dir + '/client').then(() => {
+          return fs.symlinkAsync(__dirname + '/fixtures/bower_components', dir + '/client/bower_components');
+        }),
+        fs.symlinkAsync(__dirname + '/fixtures/node_modules', dir + '/node_modules')
+      ];
+
+      if(opts.copyConfigFile) {
+        promises.push(copyAsync(path.join(TEST_DIR, 'fixtures/.yo-rc.json'), path.join(dir, '.yo-rc.json')));
+      }
+
+      // symlink our dependency directories
+      return Promise.all(promises).then(done);
+    })
+    .withGenerators([
+      require.resolve('../generators/endpoint'),
+      // [helpers.createDummyGenerator(), 'ng-component:app']
+    ])
+    // .withArguments(['upperCaseBug'])
+    .withOptions(options);
+
+  if(prompts) gen.withPrompts(prompts);
+
+  return gen.toPromise();
 }