Fixes acceptance tests

lib/blueprint.js

@@ -50,10 +50,7 @@ Blueprint.prototype.install = function(intoDir, templateVariables, dryRun) {
   var actions = {
     write: function(info) {
       ui.write('  ' + chalk.green('create') + ' ' + info.displayPath + '\n');
-
-      if (!dryRun) {
-        return writeFile(info.render(), info.outputPath);
-      }
+      return writeFile(info.render(), info.outputPath);
     },
 
     skip: function(info) {

lib/cli/index.js

@@ -17,7 +17,7 @@ require('../ext/promise');
 module.exports = cli;
 function cli(options) {
   var ui = new UI({
-    inputStream: options.inputStream,
+    inputStream:  options.inputStream,
     outputStream: options.outputStream
   });
 

lib/commands/init.js

@@ -27,7 +27,6 @@ module.exports = new Command({
     var npmInstall       = environment.tasks.npmInstall;
     var bowerInstall     = environment.tasks.bowerInstall;
 
-
     return installBlueprint.run(environment, { dryRun: options.dryRun })
       .then(function() {
         if (!options.dryRun) {

tests/acceptance/init-slow.js

@@ -1,18 +1,17 @@
 'use strict';
 
-var ember = require('../helpers/ember');
-var assert = require('assert');
-var forEach = require('lodash-node/compat/collections/forEach');
-var walkSync = require('walk-sync');
+var ember     = require('../helpers/ember');
+var assert    = require('assert');
+var forEach   = require('lodash-node/compat/collections/forEach');
+var walkSync  = require('walk-sync');
 var Blueprint = require('../../lib/blueprint');
-var path = require('path');
-var tmp = require('../helpers/tmp');
-var root = process.cwd();
-var util = require('util');
-var conf = require('../helpers/conf');
-
-describe.skip('Acceptance: ember init', function() {
+var path      = require('path');
+var tmp       = require('../helpers/tmp');
+var root      = process.cwd();
+var util      = require('util');
+var conf      = require('../helpers/conf');
 
+describe('Acceptance: ember init', function() {
   before(function() {
     conf.setup();
   });
@@ -32,9 +31,8 @@ describe.skip('Acceptance: ember init', function() {
 
   function confirmBlueprinted() {
     var blueprintPath = path.join(root, 'blueprint');
-
-    var expected = walkSync(blueprintPath).sort();
-    var actual = walkSync('.').sort();
+    var expected      = walkSync(blueprintPath).sort();
+    var actual        = walkSync('.').sort();
 
     forEach(Blueprint.renamedFiles, function(destFile, srcFile) {
       expected[expected.indexOf(srcFile)] = destFile;
@@ -49,18 +47,18 @@ describe.skip('Acceptance: ember init', function() {
   it('ember init,', function() {
     return ember([
       'init',
-      '--skip-npm-install'
+      '--dry-run'
     ]).then(confirmBlueprinted);
   });
 
   it('init an already init\'d folder', function() {
     return ember([
       'init',
-      '--skip-npm-install'
+      '--dry-run'
     ]).then(function() {
       return ember([
         'init',
-        '--skip-npm-install'
+        '--dry-run'
       ]).then(confirmBlueprinted);
     });
   });

tests/acceptance/new-slow.js

@@ -1,18 +1,18 @@
 'use strict';
 
-var fs = require('fs-extra');
-var ember = require('../helpers/ember');
-var assert = require('assert');
-var forEach = require('lodash-node/compat/collections/forEach');
-var walkSync = require('walk-sync');
+var fs        = require('fs-extra');
+var ember     = require('../helpers/ember');
+var assert    = require('assert');
+var forEach   = require('lodash-node/compat/collections/forEach');
+var walkSync  = require('walk-sync');
 var Blueprint = require('../../lib/blueprint');
-var path = require('path');
-var tmp = require('../helpers/tmp');
-var root = process.cwd();
-var util = require('util');
-var conf = require('../helpers/conf');
+var path      = require('path');
+var tmp       = require('../helpers/tmp');
+var root      = process.cwd();
+var util      = require('util');
+var conf      = require('../helpers/conf');
 
-describe.skip('Acceptance: ember new', function() {
+describe('Acceptance: ember new', function() {
   before(conf.setup);
 
   after(conf.restore);
@@ -50,7 +50,7 @@ describe.skip('Acceptance: ember new', function() {
     return ember([
       'new',
       'foo',
-      '--skip-npm-install'
+      '--dry-run'
     ]).then(confirmBlueprinted);
   });
 
@@ -71,7 +71,7 @@ describe.skip('Acceptance: ember new', function() {
     return ember([
       'new',
       'FooApp',
-      '--skip-npm-install'
+      '--dry-run'
     ]).then(function() {
       assert(!fs.existsSync('FooApp'));
 
@@ -84,12 +84,12 @@ describe.skip('Acceptance: ember new', function() {
     return ember([
       'new',
       'foo',
-      '--skip-npm-install'
+      '--dry-run'
     ]).then(function() {
       return ember([
         'new',
         'foo',
-        '--skip-npm-install'
+        '--dry-run'
       ]).then(function() {
         assert(!fs.existsSync('foo'));
       });

tests/helpers/ember.js

@@ -1,19 +1,32 @@
 'use strict';
 
-var Cli = require('../../lib/cli');
-
+var rewire   = require('rewire');
+var Cli      = rewire('../../lib/cli');
 var baseArgs = ['node', 'path/to/cli'];
-var MockUI = require('./mock-ui');
+
+Cli.__set__('UI', function() {
+  this.outputStream = [];
+  this.inputStream  = [];
+
+  this.write = function(data) {
+    this.outputStream.push(data);
+  };
+});
 
 module.exports = function ember(args) {
-  var argv;
+  var argv, cli;
 
   if (args) {
     argv = baseArgs.slice().concat(args);
   } else {
     argv = baseArgs;
   }
 
-  var ui = module.exports.ui = new MockUI();
-  return Cli.run(argv, ui);
+  cli = new Cli({
+    inputStream:  [],
+    outputStream: [],
+    cliArgs:      args
+  });
+
+  return cli;
 };