use in jasmine

packages/jest-jasmine2/package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "@babel/traverse": "^7.1.0",
     "@jest/environment": "^24.1.0",
+    "@jest/test-result": "^24.1.0",
     "@jest/types": "^24.1.0",
     "chalk": "^2.0.1",
     "co": "^4.6.0",

packages/jest-jasmine2/src/expectationResultFactory.ts

@@ -6,7 +6,7 @@
  */
 
 import prettyFormat from 'pretty-format';
-import {TestResult} from '@jest/types';
+import {FailedAssertion} from '@jest/test-result';
 
 function messageFormatter({error, message, passed}: Options) {
   if (passed) {
@@ -68,7 +68,7 @@ export type Options = {
 export default function expectationResultFactory(
   options: Options,
   initError?: Error,
-): TestResult.FailedAssertion {
+): FailedAssertion {
   const message = messageFormatter(options);
   const stack = stackFormatter(options, initError, message);
 

packages/jest-jasmine2/src/index.ts

@@ -6,7 +6,8 @@
  */
 
 import path from 'path';
-import {Config, Global, TestResult} from '@jest/types';
+import {Config, Global} from '@jest/types';
+import {AssertionResult, TestResult} from '@jest/test-result';
 import {JestEnvironment} from '@jest/environment';
 import {SnapshotStateType} from 'jest-snapshot';
 import Runtime from 'jest-runtime';
@@ -27,7 +28,7 @@ async function jasmine2(
   environment: JestEnvironment,
   runtime: Runtime,
   testPath: string,
-): Promise<TestResult.TestResult> {
+): Promise<TestResult> {
   const reporter = new JasmineReporter(globalConfig, config, testPath);
   const jasmineFactory = runtime.requireInternalModule(JASMINE);
   const jasmine = jasmineFactory.create({
@@ -173,18 +174,16 @@ async function jasmine2(
 }
 
 const addSnapshotData = (
-  results: TestResult.TestResult,
+  results: TestResult,
   snapshotState: SnapshotStateType,
 ) => {
-  results.testResults.forEach(
-    ({fullName, status}: TestResult.AssertionResult) => {
-      if (status === 'pending' || status === 'failed') {
-        // if test is skipped or failed, we don't want to mark
-        // its snapshots as obsolete.
-        snapshotState.markSnapshotsAsCheckedForTest(fullName);
-      }
-    },
-  );
+  results.testResults.forEach(({fullName, status}: AssertionResult) => {
+    if (status === 'pending' || status === 'failed') {
+      // if test is skipped or failed, we don't want to mark
+      // its snapshots as obsolete.
+      snapshotState.markSnapshotsAsCheckedForTest(fullName);
+    }
+  });
 
   const uncheckedCount = snapshotState.getUncheckedCount();
   const uncheckedKeys = snapshotState.getUncheckedKeys();

packages/jest-jasmine2/src/jasmine/Spec.ts

@@ -31,7 +31,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* eslint-disable sort-keys */
 
 import {AssertionError} from 'assert';
-import {Config, TestResult} from '@jest/types';
+import {Config} from '@jest/types';
+import {FailedAssertion, Milliseconds, Status} from '@jest/test-result';
 
 import ExpectationFailed from '../ExpectationFailed';
 import expectationResultFactory, {
@@ -62,12 +63,12 @@ export type SpecResult = {
   id: string;
   description: string;
   fullName: string;
-  duration?: TestResult.Milliseconds;
-  failedExpectations: Array<TestResult.FailedAssertion>;
+  duration?: Milliseconds;
+  failedExpectations: Array<FailedAssertion>;
   testPath: Config.Path;
   passedExpectations: Array<ReturnType<typeof expectationResultFactory>>;
   pendingReason: string;
-  status: TestResult.Status;
+  status: Status;
   __callsite?: {
     getColumnNumber: () => number;
     getLineNumber: () => number;

packages/jest-jasmine2/src/reporter.ts

@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {Config, TestResult} from '@jest/types';
+import {Config} from '@jest/types';
+import {AssertionResult, TestResult} from '@jest/test-result';
 import {formatResultsErrors} from 'jest-message-util';
 import {SpecResult} from './jasmine/Spec';
 import {SuiteResult} from './jasmine/Suite';
@@ -14,12 +15,12 @@ import {Reporter, RunDetails} from './types';
 type Microseconds = number;
 
 export default class Jasmine2Reporter implements Reporter {
-  private _testResults: Array<TestResult.AssertionResult>;
+  private _testResults: Array<AssertionResult>;
   private _globalConfig: Config.GlobalConfig;
   private _config: Config.ProjectConfig;
   private _currentSuites: Array<string>;
   private _resolve: any;
-  private _resultsPromise: Promise<TestResult.TestResult>;
+  private _resultsPromise: Promise<TestResult>;
   private _startTimes: Map<string, Microseconds>;
   private _testPath: Config.Path;
 
@@ -107,7 +108,7 @@ export default class Jasmine2Reporter implements Reporter {
     this._resolve(testResult);
   }
 
-  getResults(): Promise<TestResult.TestResult> {
+  getResults(): Promise<TestResult> {
     return this._resultsPromise;
   }
 
@@ -129,7 +130,7 @@ export default class Jasmine2Reporter implements Reporter {
   private _extractSpecResults(
     specResult: SpecResult,
     ancestorTitles: Array<string>,
-  ): TestResult.AssertionResult {
+  ): AssertionResult {
     const start = this._startTimes.get(specResult.id);
     const duration = start ? Date.now() - start : undefined;
     const status =
@@ -140,7 +141,7 @@ export default class Jasmine2Reporter implements Reporter {
           line: specResult.__callsite.getLineNumber(),
         }
       : null;
-    const results: TestResult.AssertionResult = {
+    const results: AssertionResult = {
       ancestorTitles,
       duration,
       failureMessages: [],

packages/jest-jasmine2/tsconfig.json

@@ -12,6 +12,7 @@
     {"path": "../jest-message-util"},
     {"path": "../jest-runtime"},
     {"path": "../jest-snapshot"},
+    {"path": "../jest-test-result"},
     {"path": "../jest-types"},
     {"path": "../jest-util"},
     {"path": "../pretty-format"}

packages/jest-test-result/src/index.ts

@@ -15,6 +15,8 @@ export {
   AggregatedResult,
   AssertionLocation,
   AssertionResult,
+  FailedAssertion,
+  Milliseconds,
   SerializableError,
   SnapshotSummary,
   Status,