Restore mocha --browser
This commit is contained in:
parent
eafce4526e
commit
676ff7d699
5
src/vs/base/test/common/filters.perf.data.d.ts
vendored
Normal file
5
src/vs/base/test/common/filters.perf.data.d.ts
vendored
Normal file
|
@ -0,0 +1,5 @@
|
|||
/*---------------------------------------------------------------------------------------------
|
||||
* 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[];
|
File diff suppressed because one or more lines are too long
|
@ -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;
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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); }
|
||||
|
||||
|
|
|
@ -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'
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -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}/**",
|
||||
|
|
Loading…
Reference in a new issue