Fix tests

- document npm command problems
- don't run npm command twice in same process for installing ember-disable-prototype-extensions

lib/tasks/npm-task.js

@@ -28,8 +28,7 @@ module.exports = Task.extend({
       // by default, do install peoples optional deps
       'optional': 'optional' in options ? options.optional : true,
       'save-dev': !!options['save-dev'],
-      'save-exact': !!options['save-exact'],
-      'optional': 'optional' in options ? options.optional : true
+      'save-exact': !!options['save-exact']
     };
 
     var packages = options.packages || [];

lib/utilities/npm.js

@@ -2,7 +2,22 @@
 
 var Promise = require('../ext/promise');
 
-module.exports = function npm(command, packages, options/*, npm*/) {
+// 
+
+/**
+  Runs the npm command `command` with the supplied args and load options.
+
+  Please note that the loaded module appears to retain some state, so do not
+  expect multiple invocations within the same process to work without quirks.
+  This problem is likely fixable.
+
+  @method npm
+  @param {String} command The npm command to run.
+  @param {Array} npmArgs The arguments passed to the npm command.
+  @param {Array} options The options passed when loading npm.
+  @param {Module} [npm] A reference to the npm module.
+*/
+module.exports = function npm(command, npmArgs, options/*, npm*/) {
   var lib;
   if (arguments.length === 4) {
     lib = arguments[3];
@@ -18,6 +33,6 @@ module.exports = function npm(command, packages, options/*, npm*/) {
       // it throws "Call npm.load(config, cb) before using this command."
       var operation = Promise.denodeify(lib.commands[command]);
 
-      return operation(packages || []);
+      return operation(npmArgs || []);
     });
 };

tests/acceptance/install-test-slow.js

@@ -54,7 +54,6 @@ describe('Acceptance: ember install', function() {
 
   it('installs addons via npm and runs generators', function() {
     return installAddon(['ember-cli-fastclick', 'ember-cli-photoswipe']).then(function(result) {
-
       assertFile('package.json', {
         contains: [
           /"ember-cli-fastclick": ".*"/,

tests/helpers/acceptance.js

@@ -10,7 +10,6 @@ var conf              = require('./conf');
 var existsSync        = require('exists-sync');
 var copy              = Promise.denodeify(require('cpr'));
 var root              = process.cwd();
-var npm               = require('../../lib/utilities/npm');
 
 var onOutput = {
   onOutput: function() {
@@ -114,8 +113,7 @@ function createTestTargets(projectName, options) {
       catch(handleResult).
       then(function(value) {
         if (noNodeModules) {
-          return npm('install', ['ember-disable-prototype-extensions'], { '--no-optional': true }).
-            then(function(){
+          return runCommand('npm', 'install', 'ember-disable-prototype-extensions').then(function () {
             return value;
           });
         }

tests/runner.js

@@ -29,8 +29,8 @@ testFiles = jshint.concat(testFiles);
 if (optionOrFile === 'all') {
   addFiles(mocha, testFiles);
   addFiles(mocha, '/**/*-slow.js');
-} else if (optionOrFile)  {
-  mocha.addFile(optionOrFile);
+} else if (process.argv.length > 2)  {
+  addFiles(mocha, process.argv.slice(2));
 } else {
   addFiles(mocha, testFiles);
 }

tests/unit/models/command-test.js

@@ -191,8 +191,8 @@ describe('models/command.js', function() {
       analytics: analytics,
       project: { isEmberCLIProject: function(){ return false; }},
       settings: {}
-    }).validateAndRun([]).catch(function() {
-      expect(ui.output).to.match(/You have to be inside an ember-cli project/);
+    }).validateAndRun([]).catch(function(reason) {
+      expect(reason.message).to.match(/You have to be inside an ember-cli project/);
     });
   });
 
@@ -202,8 +202,8 @@ describe('models/command.js', function() {
       analytics: analytics,
       project: { isEmberCLIProject: function(){ return true; }},
       settings: {}
-    }).validateAndRun([]).catch(function() {
-      expect(ui.output).to.match(/You cannot use.*inside an ember-cli project/);
+    }).validateAndRun([]).catch(function(reason) {
+      expect(reason.message).to.match(/You cannot use.*inside an ember-cli project/);
     });
   });