[pull] master from DefinitelyTyped:master

types/jsdom/index.d.ts

@@ -186,7 +186,7 @@ export interface ResourcesOptions {
     interceptors?: Dispatcher.DispatcherComposeInterceptor[] | undefined;
 }
 
-export interface DOMWindow extends Omit<Window, "top" | "self" | "window"> {
+export interface DOMWindow extends Omit<Window, "top" | "self" | "window" | number> {
     [key: string]: any;
     [index: number]: any;
 

types/jsdom/jsdom-tests.ts

@@ -24,6 +24,9 @@ domWindow.WebAssembly; // $ExpectType typeof WebAssembly
 domWindow.InputEvent.prototype; // $ExpectType InputEvent
 domWindow.external; // $ExpectType External
 
+domWindow["Infinity"]; // $ExpectType number
+domWindow["NaN"]; // $ExpectType number
+
 domWindow.FinalizationRegistry; // $ExpectType FinalizationRegistryConstructor
 domWindow.WeakRef; // $ExpectType WeakRefConstructor
 

types/qunit/index.d.ts

@@ -593,7 +593,7 @@ declare global {
         }
 
         interface TodoFunction {
-            (name: string, callback?: TestFunctionCallback): void;
+            (name: string, callback: TestFunctionCallback): void;
             each: EachFunction;
         }
 

types/qunit/test/global-test.ts

@@ -21,8 +21,6 @@ QUnit.test.todo("todo test example", function(assert) {
     assert.ok(true, "this is a todo");
 });
 
-QUnit.test.todo("todo test example w/o callback");
-
 QUnit.test.only("only test example", function(assert) {
     assert.ok(true, "only this is called");
 });

types/qunit/test/module-test.ts

@@ -17,8 +17,6 @@ QUnit.module("basic tests for importing QUnit", function(hooks) {
         assert.ok(true, "this is a todo");
     });
 
-    QUnit.test.todo("todo test example w/o callback");
-
     QUnit.test.only("only test example", function(assert) {
         assert.ok(true, "only this is called");
     });