summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2017-07-31 10:31:48 +0100
committerAndrej Mihajlov <and@mullvad.net>2017-07-31 10:43:13 +0100
commitc37ade4bb002efa244f152e89ca183664995325e (patch)
treeb606421430cfa7cab4aeb73c1c75ad24b558d3c3
parente13fe630fce123981e502939aafc3569a9412e0c (diff)
downloadmullvadvpn-c37ade4bb002efa244f152e89ca183664995325e.tar.xz
mullvadvpn-c37ade4bb002efa244f152e89ca183664995325e.zip
Remove explicit dependency to mocha
electron-mocha already depends on it
-rw-r--r--flow-typed/npm/mocha_v3.1.x.js236
-rw-r--r--package.json1
-rw-r--r--yarn.lock2
3 files changed, 217 insertions, 22 deletions
diff --git a/flow-typed/npm/mocha_v3.1.x.js b/flow-typed/npm/mocha_v3.1.x.js
index 4f7a096caf..1a35f6e448 100644
--- a/flow-typed/npm/mocha_v3.1.x.js
+++ b/flow-typed/npm/mocha_v3.1.x.js
@@ -1,25 +1,221 @@
-// flow-typed signature: 5f3dd89c049243ddb5d45e60e5615827
-// flow-typed version: d0062bf209/mocha_v3.1.x/flow_>=v0.22.x
+// flow-typed signature: 58fb316c623a4f7918b0e2529256be8c
+// flow-typed version: 0ef6a9a08b/mocha_v3.1.x/flow_>=v0.28.x
-type TestFunction = ((done: (error?: any) => void) => void | Promise<mixed>);
+declare interface $npm$mocha$SetupOptions {
+ slow?: number;
+ timeout?: number;
+ ui?: string;
+ globals?: Array<any>;
+ reporter?: any;
+ bail?: boolean;
+ ignoreLeaks?: boolean;
+ grep?: any;
+}
-declare var describe : {
- (name:string, spec:() => void): void;
- only(description:string, spec:() => void): void;
- skip(description:string, spec:() => void): void;
- timeout(ms:number): void;
-};
+declare type $npm$mocha$done = (error?: any) => any;
-declare var context : typeof describe;
+// declare interface $npm$mocha$SuiteCallbackContext {
+// timeout(ms: number): void;
+// retries(n: number): void;
+// slow(ms: number): void;
+// }
-declare var it : {
- (name:string, spec?:TestFunction): void;
- only(description:string, spec:TestFunction): void;
- skip(description:string, spec:TestFunction): void;
- timeout(ms:number): void;
-};
+// declare interface $npm$mocha$TestCallbackContext {
+// skip(): void;
+// timeout(ms: number): void;
+// retries(n: number): void;
+// slow(ms: number): void;
+// [index: string]: any;
+// }
-declare function before(method : TestFunction):void;
-declare function beforeEach(method : TestFunction):void;
-declare function after(method : TestFunction):void;
-declare function afterEach(method : TestFunction):void;
+declare interface $npm$mocha$Suite {
+ parent: $npm$mocha$Suite;
+ title: string;
+ fullTitle(): string;
+}
+
+declare interface $npm$mocha$ContextDefinition {
+ (description: string, callback: (/* this: $npm$mocha$SuiteCallbackContext */) => void): $npm$mocha$Suite;
+ only(description: string, callback: (/* this: $npm$mocha$SuiteCallbackContext */) => void): $npm$mocha$Suite;
+ skip(description: string, callback: (/* this: $npm$mocha$SuiteCallbackContext */) => void): void;
+ timeout(ms: number): void;
+}
+
+declare interface $npm$mocha$TestDefinition {
+ (expectation: string, callback?: (/* this: $npm$mocha$TestCallbackContext, */ done: $npm$mocha$done) => mixed): $npm$mocha$Test;
+ only(expectation: string, callback?: (/* this: $npm$mocha$TestCallbackContext, */ done: $npm$mocha$done) => mixed): $npm$mocha$Test;
+ skip(expectation: string, callback?: (/* this: $npm$mocha$TestCallbackContext, */ done: $npm$mocha$done) => mixed): void;
+ timeout(ms: number): void;
+ state: 'failed' | 'passed';
+}
+
+declare interface $npm$mocha$Runner {}
+
+declare class $npm$mocha$BaseReporter {
+ stats: {
+ suites: number;
+ tests: number;
+ passes: number;
+ pending: number;
+ failures: number;
+ };
+
+ constructor(runner: $npm$mocha$Runner): $npm$mocha$BaseReporter;
+}
+
+declare class $npm$mocha$DocReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$DotReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$HTMLReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$HTMLCovReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$JSONReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$JSONCovReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$JSONStreamReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$LandingReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$ListReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$MarkdownReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$MinReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$NyanReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$ProgressReporter extends $npm$mocha$BaseReporter {
+ constructor(runner: $npm$mocha$Runner, options?: {
+ open?: string;
+ complete?: string;
+ incomplete?: string;
+ close?: string;
+ }): $npm$mocha$ProgressReporter;
+}
+declare class $npm$mocha$SpecReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$TAPReporter extends $npm$mocha$BaseReporter {}
+declare class $npm$mocha$XUnitReporter extends $npm$mocha$BaseReporter {
+ constructor(runner: $npm$mocha$Runner, options?: any): $npm$mocha$XUnitReporter;
+}
+
+declare class $npm$mocha$Mocha {
+ currentTest: $npm$mocha$TestDefinition;
+ constructor(options?: {
+ grep?: RegExp;
+ ui?: string;
+ reporter?: string;
+ timeout?: number;
+ reporterOptions?: any;
+ slow?: number;
+ bail?: boolean;
+ }): $npm$mocha$Mocha;
+ setup(options: $npm$mocha$SetupOptions): this;
+ bail(value?: boolean): this;
+ addFile(file: string): this;
+ reporter(name: string): this;
+ reporter(reporter: (runner: $npm$mocha$Runner, options: any) => any): this;
+ ui(value: string): this;
+ grep(value: string): this;
+ grep(value: RegExp): this;
+ invert(): this;
+ ignoreLeaks(value: boolean): this;
+ checkLeaks(): this;
+ throwError(error: Error): void;
+ growl(): this;
+ globals(value: string): this;
+ globals(values: Array<string>): this;
+ useColors(value: boolean): this;
+ useInlineDiffs(value: boolean): this;
+ timeout(value: number): this;
+ slow(value: number): this;
+ enableTimeouts(value: boolean): this;
+ asyncOnly(value: boolean): this;
+ noHighlighting(value: boolean): this;
+ run(onComplete?: (failures: number) => void): $npm$mocha$Runner;
+
+ static reporters: {
+ Doc: $npm$mocha$DocReporter,
+ Dot: $npm$mocha$DotReporter,
+ HTML: $npm$mocha$HTMLReporter,
+ HTMLCov: $npm$mocha$HTMLCovReporter,
+ JSON: $npm$mocha$JSONReporter,
+ JSONCov: $npm$mocha$JSONCovReporter,
+ JSONStream: $npm$mocha$JSONStreamReporter,
+ Landing: $npm$mocha$LandingReporter,
+ List: $npm$mocha$ListReporter,
+ Markdown: $npm$mocha$MarkdownReporter,
+ Min: $npm$mocha$MinReporter,
+ Nyan: $npm$mocha$NyanReporter,
+ Progress: $npm$mocha$ProgressReporter,
+ };
+}
+
+// declare interface $npm$mocha$HookCallbackContext {
+// skip(): void;
+// timeout(ms: number): void;
+// [index: string]: any;
+// }
+
+declare interface $npm$mocha$Runnable {
+ title: string;
+ fn: Function;
+ async: boolean;
+ sync: boolean;
+ timedOut: boolean;
+}
+
+declare interface $npm$mocha$Test extends $npm$mocha$Runnable {
+ parent: $npm$mocha$Suite;
+ pending: boolean;
+ state: 'failed' | 'passed' | void;
+ fullTitle(): string;
+}
+
+// declare interface $npm$mocha$BeforeAndAfterContext extends $npm$mocha$HookCallbackContext {
+// currentTest: $npm$mocha$Test;
+// }
+
+declare var mocha: $npm$mocha$Mocha;
+declare var describe: $npm$mocha$ContextDefinition;
+declare var xdescribe: $npm$mocha$ContextDefinition;
+declare var context: $npm$mocha$ContextDefinition;
+declare var suite: $npm$mocha$ContextDefinition;
+declare var it: $npm$mocha$TestDefinition;
+declare var xit: $npm$mocha$TestDefinition;
+declare var test: $npm$mocha$TestDefinition;
+declare var specify: $npm$mocha$TestDefinition;
+
+declare function run(): void;
+
+declare function setup(callback: (/* this: $npm$mocha$BeforeAndAfterContext, */ done: $npm$mocha$done) => mixed): void;
+declare function teardown(callback: (/* this: $npm$mocha$BeforeAndAfterContext, */ done: $npm$mocha$done) => mixed): void;
+declare function suiteSetup(callback: (/* this: $npm$mocha$HookCallbackContext, */ done: $npm$mocha$done) => mixed): void;
+declare function suiteTeardown(callback: (/* this: $npm$mocha$HookCallbackContext, */ done: $npm$mocha$done) => mixed): void;
+declare function before(callback: (/* this: $npm$mocha$HookCallbackContext, */ done: $npm$mocha$done) => mixed): void;
+declare function before(description: string, callback: (/* this: $npm$mocha$HookCallbackContext, */ done: $npm$mocha$done) => mixed): void;
+declare function after(callback: (/* this: $npm$mocha$HookCallbackContext, */ done: $npm$mocha$done) => mixed): void;
+declare function after(description: string, callback: (/* this: $npm$mocha$HookCallbackContext, */ done: $npm$mocha$done) => mixed): void;
+declare function beforeEach(callback: (/* this: $npm$mocha$BeforeAndAfterContext, */ done: $npm$mocha$done) => mixed): void;
+declare function beforeEach(description: string, callback: (/* this: $npm$mocha$BeforeAndAfterContext, */ done: $npm$mocha$done) => mixed): void;
+declare function afterEach(callback: (/* this: $npm$mocha$BeforeAndAfterContext, */ done: $npm$mocha$done) => mixed): void;
+declare function afterEach(description: string, callback: (/* this: $npm$mocha$BeforeAndAfterContext, */ done: $npm$mocha$done) => mixed): void;
+
+declare module "mocha" {
+ declare export var mocha: typeof mocha;
+ declare export var describe: typeof describe;
+ declare export var xdescribe: typeof xdescribe;
+ declare export var context: typeof context;
+ declare export var suite: typeof suite;
+ declare export var it: typeof it;
+ declare export var xit: typeof xit;
+ declare export var test: typeof test;
+ declare export var specify: typeof specify;
+
+ declare export var run: typeof run;
+
+ declare export var setup: typeof setup;
+ declare export var teardown: typeof teardown;
+ declare export var suiteSetup: typeof suiteSetup;
+ declare export var suiteTeardown: typeof suiteTeardown;
+ declare export var before: typeof before;
+ declare export var before: typeof before;
+ declare export var after: typeof after;
+ declare export var after: typeof after;
+ declare export var beforeEach: typeof beforeEach;
+ declare export var beforeEach: typeof beforeEach;
+ declare export var afterEach: typeof afterEach;
+ declare export var afterEach: typeof afterEach;
+
+ declare export default $npm$mocha$Mocha;
+}
diff --git a/package.json b/package.json
index 00e7ac00bc..5ea8575d00 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
"flow-bin": "^0.50.0",
"flow-typed": "^2.1.5",
"isomorphic-fetch": "^2.2.1",
- "mocha": "^3.2.0",
"npm-run-all": "^4.0.1",
"redux-mock-store": "^1.2.2",
"rimraf": "^2.5.4"
diff --git a/yarn.lock b/yarn.lock
index 682f60282c..f35780e40f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3653,7 +3653,7 @@ mkdirp@0.5.0:
dependencies:
minimist "0.0.8"
-mocha@^3.0.0, mocha@^3.2.0:
+mocha@^3.0.0:
version "3.4.2"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.4.2.tgz#d0ef4d332126dbf18d0d640c9b382dd48be97594"
dependencies: