Jest jasmine/ts migration (#7970)

CHANGELOG.md

@@ -37,6 +37,7 @@
 
 ### Chore & Maintenance
 
+- `[jest-jasmine2]`: TS migration ([#7970](https://github.com/facebook/jest/pull/7970))
 - `[jest-each]`: Refactor into multiple files with better types ([#8018](https://github.com/facebook/jest/pull/8018))
 - `[jest-each]`: Migrate to Typescript ([#8007](https://github.com/facebook/jest/pull/8007))
 - `[jest-environment-jsdom]`: Migrate to TypeScript ([#7985](https://github.com/facebook/jest/pull/8003))

packages/jest-jasmine2/package.json

@@ -8,24 +8,26 @@
   },
   "license": "MIT",
   "main": "build/index.js",
+  "types": "build/index.d.ts",
   "dependencies": {
     "@babel/traverse": "^7.1.0",
+    "@jest/environment": "^24.1.0",
+    "@jest/types": "^24.1.0",
     "chalk": "^2.0.1",
     "co": "^4.6.0",
     "expect": "^24.1.0",
     "is-generator-fn": "^2.0.0",
     "jest-each": "^24.0.0",
     "jest-matcher-utils": "^24.0.0",
     "jest-message-util": "^24.0.0",
+    "jest-runtime": "^24.1.0",
     "jest-snapshot": "^24.1.0",
     "jest-util": "^24.0.0",
     "pretty-format": "^24.0.0",
     "throat": "^4.0.0"
   },
   "devDependencies": {
-    "@types/babel__traverse": "^7.0.4",
-    "jest-diff": "^24.0.0",
-    "jest-runtime": "^24.1.0"
+    "@types/babel__traverse": "^7.0.4"
   },
   "engines": {
     "node": ">= 6"

packages/jest-jasmine2/src/ExpectationFailed.js → packages/jest-jasmine2/src/ExpectationFailed.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 export default class ExpectationFailed extends Error {}

packages/jest-jasmine2/src/PCancelable.js

@@ -1,4 +1,9 @@
-// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 'use strict';
 

packages/jest-jasmine2/src/__tests__/Suite.test.js → packages/jest-jasmine2/src/__tests__/Suite.test.ts

@@ -6,21 +6,20 @@
  *
  */
 
-'use strict';
-
-import Suite from '../jasmine/Suite';
+import Suite, {Attributes} from '../jasmine/Suite';
 
 describe('Suite', () => {
-  let suite;
+  let suite: Suite;
 
   beforeEach(() => {
     suite = new Suite({
       getTestPath: () => '',
-    });
+    } as Attributes);
   });
 
   it("doesn't throw on addExpectationResult when there are no children", () => {
     expect(() => {
+      // @ts-ignore
       suite.addExpectationResult();
     }).not.toThrow();
   });

packages/jest-jasmine2/src/__tests__/expectationResultFactory.test.js → packages/jest-jasmine2/src/__tests__/expectationResultFactory.test.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 import expectationResultFactory from '../expectationResultFactory';
 
 describe('expectationResultFactory', () => {

packages/jest-jasmine2/src/__tests__/hooksError.test.js → packages/jest-jasmine2/src/__tests__/hooksError.test.ts

@@ -3,15 +3,14 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
-'use strict';
+export type SharedHookType = 'afterAll' | 'beforeAll';
+export type HookType = SharedHookType | 'afterEach' | 'beforeEach';
 
 describe.each([['beforeEach'], ['beforeAll'], ['afterEach'], ['afterAll']])(
   '%s hooks error throwing',
-  fn => {
+  (fn: HookType) => {
     test.each([
       ['String'],
       [1],

packages/jest-jasmine2/src/__tests__/itTestError.test.js → packages/jest-jasmine2/src/__tests__/itTestError.test.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 describe('test/it error throwing', () => {
   it(`it throws error with missing callback function`, () => {
     expect(() => {
@@ -18,11 +16,13 @@ describe('test/it error throwing', () => {
   });
   it(`it throws an error when first argument isn't a string`, () => {
     expect(() => {
+      // @ts-ignore
       it(() => {});
     }).toThrowError(`Invalid first argument, () => {}. It must be a string.`);
   });
   it('it throws an error when callback function is not a function', () => {
     expect(() => {
+      // @ts-ignore
       it('test3', 'test3b');
     }).toThrowError(
       'Invalid second argument, test3b. It must be a callback function.',
@@ -37,11 +37,13 @@ describe('test/it error throwing', () => {
   });
   test(`test throws an error when first argument isn't a string`, () => {
     expect(() => {
+      // @ts-ignore
       test(() => {});
     }).toThrowError(`Invalid first argument, () => {}. It must be a string.`);
   });
   test('test throws an error when callback function is not a function', () => {
     expect(() => {
+      // @ts-ignore
       test('test6', 'test6b');
     }).toThrowError(
       'Invalid second argument, test6b. It must be a callback function.',

packages/jest-jasmine2/src/__tests__/itToTestAlias.test.js → packages/jest-jasmine2/src/__tests__/itToTestAlias.test.ts

@@ -6,6 +6,4 @@
  *
  */
 
-'use strict';
-
 test('global.test', () => {});

packages/jest-jasmine2/src/__tests__/iterators.test.js → packages/jest-jasmine2/src/__tests__/iterators.test.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 describe('iterators', () => {
   it('works for arrays', () => {
     const mixedArray = [1, {}, []];
@@ -55,9 +53,14 @@ describe('iterators', () => {
   });
 
   it('works for Maps', () => {
-    const keyValuePairs = [['key1', 'value1'], ['key2', 'value2']];
-    const smallerKeyValuePairs = [['key1', 'value1']];
-    const biggerKeyValuePairs = [
+    const keyValuePairs: ReadonlyArray<[string, string]> = [
+      ['key1', 'value1'],
+      ['key2', 'value2'],
+    ];
+    const smallerKeyValuePairs: ReadonlyArray<[string, string]> = [
+      ['key1', 'value1'],
+    ];
+    const biggerKeyValuePairs: ReadonlyArray<[string, string]> = [
       ['key1', 'value1'],
       ['key2', 'value2'],
       ['key3', 'value3'],

packages/jest-jasmine2/src/__tests__/matchers.test.js → packages/jest-jasmine2/src/__tests__/matchers.test.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 describe('matchers', () => {
   it('proxies matchers to expect', () => {
     expect(() => expect(1).toBe(2)).toThrowErrorMatchingSnapshot();

packages/jest-jasmine2/src/__tests__/pTimeout.test.js → packages/jest-jasmine2/src/__tests__/pTimeout.test.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 jest.useFakeTimers();
 
 import pTimeout from '../pTimeout';

packages/jest-jasmine2/src/__tests__/queueRunner.test.js → packages/jest-jasmine2/src/__tests__/queueRunner.test.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 import queueRunner from '../queueRunner';
 
 describe('queueRunner', () => {
@@ -28,6 +26,7 @@ describe('queueRunner', () => {
       ],
       setTimeout,
     };
+    // @ts-ignore
     await queueRunner(options);
     expect(fnOne).toHaveBeenCalled();
     expect(fnTwo).toHaveBeenCalled();
@@ -51,6 +50,7 @@ describe('queueRunner', () => {
       ],
       setTimeout,
     };
+    // @ts-ignore
     await queueRunner(options);
     expect(fnOne).toHaveBeenCalled();
     expect(fail).toHaveBeenCalled();
@@ -79,6 +79,7 @@ describe('queueRunner', () => {
       ],
       setTimeout,
     };
+    // @ts-ignore
     await queueRunner(options);
     expect(fnOne).toHaveBeenCalled();
     expect(onException).toHaveBeenCalledWith(error);
@@ -87,7 +88,7 @@ describe('queueRunner', () => {
   });
 
   it('passes an error to `onException` on timeout.', async () => {
-    const fnOne = jest.fn(next => {});
+    const fnOne = jest.fn(_next => {});
     const fnTwo = jest.fn(next => next());
     const onException = jest.fn();
     const options = {
@@ -106,6 +107,7 @@ describe('queueRunner', () => {
       ],
       setTimeout,
     };
+    // @ts-ignore
     await queueRunner(options);
     expect(fnOne).toHaveBeenCalled();
     expect(onException).toHaveBeenCalled();
@@ -125,6 +127,7 @@ describe('queueRunner', () => {
       queueableFns: [{fn: failFn}],
       setTimeout,
     };
+    // @ts-ignore
     await queueRunner(options);
 
     expect(options.fail).toHaveBeenCalledWith('miserably', 'failed');
@@ -149,6 +152,7 @@ describe('queueRunner', () => {
       ],
       setTimeout,
     };
+    // @ts-ignore
     await queueRunner(options);
     expect(fnOne).toHaveBeenCalled();
     expect(fail).toHaveBeenCalledWith(error);

packages/jest-jasmine2/src/__tests__/reporter.test.js → packages/jest-jasmine2/src/__tests__/reporter.test.ts

@@ -6,29 +6,33 @@
  *
  */
 
-'use strict';
-
 import JasmineReporter from '../reporter';
+import {SuiteResult} from '../jasmine/Suite';
+import {SpecResult} from '../jasmine/Spec';
 
 describe('Jasmine2Reporter', () => {
-  let reporter;
+  let reporter: JasmineReporter;
 
   beforeEach(() => {
+    // @ts-ignore
     reporter = new JasmineReporter({});
   });
 
   it('reports nested suites', () => {
-    const makeSpec = name => ({
-      description: 'description',
-      failedExpectations: [],
-      fullName: name,
-    });
-    reporter.suiteStarted({description: 'parent'});
-    reporter.suiteStarted({description: 'child'});
+    const makeSpec = (name: string) =>
+      ({
+        description: 'description',
+        failedExpectations: [],
+        fullName: name,
+      } as SpecResult);
+    reporter.suiteStarted({description: 'parent'} as SuiteResult);
+    reporter.suiteStarted({description: 'child'} as SuiteResult);
     reporter.specDone(makeSpec('spec 1'));
+    // @ts-ignore
     reporter.suiteDone();
-    reporter.suiteStarted({description: 'child 2'});
+    reporter.suiteStarted({description: 'child 2'} as SuiteResult);
     reporter.specDone(makeSpec('spec 2'));
+    // @ts-ignore
     reporter.jasmineDone();
 
     return reporter.getResults().then(runResults => {

packages/jest-jasmine2/src/__tests__/todoError.test.js → packages/jest-jasmine2/src/__tests__/todoError.test.ts

@@ -6,11 +6,10 @@
  *
  */
 
-'use strict';
-
 describe('test/it.todo error throwing', () => {
   it('it throws error when given no arguments', () => {
     expect(() => {
+      // @ts-ignore
       it.todo();
     }).toThrowError('Todo must be called with only a description.');
   });
@@ -21,6 +20,7 @@ describe('test/it.todo error throwing', () => {
   });
   it('it throws error when given none string description', () => {
     expect(() => {
+      // @ts-ignore
       it.todo(() => {});
     }).toThrowError('Todo must be called with only a description.');
   });