Restore mocha --browser

src/vs/base/test/common/filters.perf.data.d.ts

+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+export const data: string[];
\ No newline at end of file

src/vs/base/test/common/filters.perf.test.ts

@@ -6,8 +6,8 @@
 
 // import * as assert from 'assert';
 import * as filters from 'vs/base/common/filters';
+import { data } from './filters.perf.data';
 
-const data = <string[]>require.__$__nodeRequire(require.toUrl('./filters.perf.data.json'));
 const patterns = ['cci', 'ida', 'pos', 'CCI', 'enbled', 'callback', 'gGame', 'cons'];
 
 const _enablePerf = false;

src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts

@@ -5,6 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
@@ -14,10 +15,6 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
-// TODO@Sandeep layer breaker: cannot depend on node modules from /common/ and sinon is a node module
-// tslint:disable-next-line:import-patterns
-import * as sinon from 'sinon';
-
 // TODO@Sandeep layer breaker: cannot depend on /workbench/ from /platform/
 // tslint:disable-next-line:import-patterns
 import { TestContextService } from 'vs/workbench/test/workbenchTestServices';

src/vs/platform/instantiation/test/common/instantiationServiceMock.ts

@@ -5,16 +5,13 @@
 
 'use strict';
 
+import * as sinon from 'sinon';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/base/common/types';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
-// TODO@Sandeep layer breaker: cannot depend on node modules from /common/ and sinon is a node module
-// tslint:disable-next-line:import-patterns
-import * as sinon from 'sinon';
-
 interface IServiceMock<T> {
 	id: ServiceIdentifier<T>;
 	service: any;

test/browser.js

@@ -21,11 +21,12 @@ var app = express();
 
 app.use('/out', express.static(path.join(root, 'out')));
 app.use('/test', express.static(path.join(root, 'test')));
+app.use('/node_modules', express.static(path.join(root, 'node_modules')));
 
 app.get('/', function (req, res) {
-	glob('**/test/**/*.js', {
+	glob('**/vs/{base,platform,editor}/**/test/{common,browser}/**/*.test.js', {
 		cwd: path.join(root, 'out'),
-		ignore: ['**/test/{node,electron*}/**/*.js']
+		// ignore: ['**/test/{node,electron*}/**/*.js']
 	}, function (err, files) {
 		if (err) { return res.sendStatus(500); }
 

test/index.html

@@ -18,7 +18,8 @@
 		require.config({
 			baseUrl: '/out',
 			paths: {
-				assert: '/test/assert.js'
+				assert: '/test/assert.js',
+				sinon: '/node_modules/sinon/pkg/sinon-1.17.7.js'
 			}
 		});
 

tslint.json

@@ -116,6 +116,7 @@
 				"target": "**/vs/platform/*/test/common/**",
 				"restrictions": [
 					"assert",
+					"sinon",
 					"vs/nls",
 					"**/vs/base/common/**",
 					"**/vs/platform/*/common/**",
@@ -136,6 +137,7 @@
 				"target": "**/vs/platform/*/test/browser/**",
 				"restrictions": [
 					"assert",
+					"sinon",
 					"vs/nls",
 					"**/vs/base/{common,browser}/**",
 					"**/vs/platform/*/{common,browser}/**",