Add double quotes to e2e command passed through option

- Remove analytics from spec #3688
- Fix sinon types

Author: jupapios

package.json

@@ -145,6 +145,7 @@
     "@types/node": "^6.0.36",
     "@types/request": "0.0.30",
     "@types/rimraf": "0.0.25-alpha",
+    "@types/sinon": "^1.16.33",
     "@types/source-map": "^0.5.0",
     "@types/webpack": "^1.12.22-alpha",
     "chai": "^3.5.0",
@@ -165,7 +166,7 @@
     "request": "^2.74.0",
     "resolve-bin": "^0.4.0",
     "rewire": "^2.5.1",
-    "sinon": "^1.17.3",
+    "sinon": "^1.17.6",
     "through": "^2.3.8",
     "tree-kill": "^1.0.0",
     "ts-node": "^1.3.0",

packages/angular-cli/tasks/e2e.ts

@@ -10,7 +10,7 @@ export const E2eTask = Task.extend({
     let exitCode = 0;
 
     if (options.suite) {
-      commandArgs.push(`--suite=${options.suite}`);
+      commandArgs.push(`--suite="${options.suite}"`);
     }
 
     return new Promise((resolve) => {

tests/unit/commands/e2e.spec.ts

@@ -1,11 +1,10 @@
 import E2eCommand from 'angular-cli/commands/e2e';
 import { CliConfig } from 'angular-cli/models/config/config';
-import { stub } from 'sinon';
+import { stub, SinonStub } from 'sinon';
 import { expect } from 'chai';
 import * as proc from 'child_process';
 
 const MockUI = require('../../helpers/mock-ui');
-const MockAnalytics = require('../../helpers/mock-analytics');
 const MockProject = require('../../helpers/mock-project');
 
 function createProject() {
@@ -23,26 +22,29 @@ function createProject() {
 }
 
 describe('e2e command', () => {
-  let command: E2eCommand;
+  let command: any;
+  let exec: SinonStub;
 
   beforeEach(() => {
     command = new E2eCommand({
       settings: {},
       project: createProject(),
       ui: new MockUI(),
-      analytics: new MockAnalytics(),
     });
   });
 
   beforeEach(() => {
-    stub(proc, 'exec').callsArg(1);
+    exec = stub(proc, 'exec').callsArg(1);
+  });
+
+  afterEach(() => {
+    exec.restore();
   });
 
   it('passes through the suite option', () => {
-    const commandOption = '--suite=suiteA';
-    return command.validateAndRun([commandOption]).then(() => {
-      expect(proc.exec.calledOnce).to.be.true;
-      expect(proc.exec.firstCall.args[0]).to.have.string(` ${commandOption}`);
+    return command.validateAndRun(['--suite', 'suiteA,suite B']).then(() => {
+      expect(exec.calledOnce).to.be.true;
+      expect(exec.firstCall.args[0]).to.have.string(' --suite="suiteA,suite B"');
     });
   });
 });