clean up

Author: chris-olszewski

packages/ai-sdk/src/__tests__/test-ai-sdk.ts

@@ -542,11 +542,8 @@ test('callToolActivity awaits tool.execute before closing MCP client', async (t)
   }) as Record<string, (args: unknown) => Promise<unknown>>;
 
   // Get the callTool activity
-  const callToolActivity = activities['testServer-callTool'];
-  if (!callToolActivity) {
-    t.fail('callToolActivity should exist');
-    return;
-  }
+  const callToolActivity = activities['testServer-callTool']!;
+  t.truthy(callToolActivity, 'callToolActivity should exist');
 
   // Call the activity
   const result = await callToolActivity({

packages/interceptors-opentelemetry/src/__tests__/test-otel.ts

@@ -27,7 +27,6 @@ import {
 import { WorkflowInboundCallsInterceptor, WorkflowOutboundCallsInterceptor } from '@temporalio/workflow';
 
 import {
-  isSet,
   RUN_INTEGRATION_TESTS,
   loadHistory as loadHistoryBase,
   createTestWorkflowBundle,

packages/interceptors-opentelemetry/src/__tests__/workflows/signal-start-otel.ts

@@ -7,13 +7,11 @@ import {
 
 export const startSignal = workflow.defineSignal('startSignal');
 
-interface LocalActivities {
-  a(): Promise<string>;
-  b(): Promise<string>;
-  c(): Promise<string>;
-}
-
-const { a, b, c } = workflow.proxyLocalActivities<LocalActivities>({
+const { a, b, c } = workflow.proxyLocalActivities<{
+  a: () => Promise<string>;
+  b: () => Promise<string>;
+  c: () => Promise<string>;
+}>({
   scheduleToCloseTimeout: '1m',
 });
 

packages/test-helpers/src/ava-helpers.ts

@@ -1,6 +1,5 @@
 import ava, { TestFn } from 'ava';
 import { inWorkflowContext } from '@temporalio/workflow';
-import { RUN_TIME_SKIPPING_TESTS } from './flags';
 
 function noopTest(): void {
   // eslint: this function body is empty and it's okay.
@@ -20,6 +19,4 @@ noopTest.skip = () => noopTest;
  */
 export const test: TestFn<unknown> = inWorkflowContext() ? (noopTest as any) : ava;
 
-export const testTimeSkipping = RUN_TIME_SKIPPING_TESTS ? test : noopTest;
-
 export { noopTest };

packages/test-helpers/src/bundler.ts

@@ -5,6 +5,8 @@ import type { BundleOptions } from '@temporalio/worker';
  * These are modules that should be ignored when bundling workflow code.
  */
 export const baseBundlerIgnoreModules = [
+  // This is a bit ugly but it does the trick, when a test that includes workflow code tries to import a forbidden
+  // workflow module, add it to this list:
   '@temporalio/common/lib/internal-non-workflow',
   '@temporalio/activity',
   '@temporalio/client',

packages/test-helpers/src/flags.ts

@@ -1,8 +1,5 @@
 import { inWorkflowContext } from '@temporalio/workflow';
 
-/**
- * Parse a boolean environment variable
- */
 export function isSet(env: string | undefined, def: boolean): boolean {
   if (env === undefined) return def;
   env = env.toLocaleLowerCase();

packages/test-helpers/src/index.ts

@@ -27,7 +27,7 @@ export { baseBundlerIgnoreModules, createBaseBundlerOptions } from './bundler';
 export { ByteSkewerPayloadCodec } from './codecs';
 
 // AVA helpers
-export { test, testTimeSkipping, noopTest } from './ava-helpers';
+export { test, noopTest } from './ava-helpers';
 
 // Wrappers
 export { Worker, TestWorkflowEnvironment } from './wrappers';

packages/test/src/helpers.ts

@@ -1,10 +1,8 @@
-import * as fs from 'fs/promises';
 import path from 'path';
 import * as grpc from '@grpc/grpc-js';
 import asyncRetry from 'async-retry';
 import { v4 as uuid4 } from 'uuid';
 import { Client, Connection } from '@temporalio/client';
-import { historyToJSON } from '@temporalio/common/lib/proto-utils';
 import * as iface from '@temporalio/proto';
 
 // Re-export from test-helpers
@@ -13,53 +11,32 @@ export {
   waitUntil,
   u8,
   approximatelyEqual,
-  isSet,
   RUN_INTEGRATION_TESTS,
   REUSE_V8_CONTEXT,
   RUN_TIME_SKIPPING_TESTS,
-  TESTS_CLI_VERSION,
-  TESTS_TIME_SKIPPING_SERVER_VERSION,
   cleanStackTrace,
   cleanOptionalStackTrace,
   compareStackTrace,
   getRandomPort,
   ByteSkewerPayloadCodec,
   test,
-  testTimeSkipping,
+  noopTest,
   Worker,
   TestWorkflowEnvironment,
-  baseBundlerIgnoreModules,
+} from '@temporalio/test-helpers';
+import {
+  createBaseBundlerOptions,
+  loadHistory as loadHistoryBase,
+  saveHistory as saveHistoryBase,
 } from '@temporalio/test-helpers';
 
 /**
  * Package-specific bundler options that include local activity and mock-native-worker modules.
  */
-export const bundlerOptions = {
-  // This is a bit ugly but it does the trick, when a test that includes workflow code tries to import a forbidden
-  // workflow module, add it to this list:
-  ignoreModules: [
-    '@temporalio/common/lib/internal-non-workflow',
-    '@temporalio/activity',
-    '@temporalio/client',
-    '@temporalio/testing',
-    '@temporalio/nexus',
-    '@temporalio/worker',
-    'ava',
-    'crypto',
-    'module',
-    'path',
-    'stack-utils',
-    '@grpc/grpc-js',
-    'async-retry',
-    'uuid',
-    'net',
-    'fs/promises',
-    'timers',
-    'timers/promises',
-    require.resolve('./activities'),
-    require.resolve('./mock-native-worker'),
-  ],
-};
+export const bundlerOptions = createBaseBundlerOptions([
+  require.resolve('./activities'),
+  require.resolve('./mock-native-worker'),
+]);
 
 // Some of our tests expect "default custom search attributes" to exists, which used to be the case
 // in all deployment with support for advanced visibility. However, this might no longer be true in
@@ -119,24 +96,16 @@ export async function registerDefaultCustomSearchAttributes(connection: Connecti
 
 /**
  * Load a history file from the history_files directory.
- * This is kept here for backward compatibility with existing tests.
  */
 export async function loadHistory(fname: string): Promise<iface.temporal.api.history.v1.History> {
-  const isJson = fname.endsWith('json');
   const fpath = path.resolve(__dirname, `../history_files/${fname}`);
-  if (isJson) {
-    const hist = await fs.readFile(fpath, 'utf8');
-    return JSON.parse(hist);
-  } else {
-    const hist = await fs.readFile(fpath);
-    return iface.temporal.api.history.v1.History.decode(hist);
-  }
+  return loadHistoryBase(fpath);
 }
 
 /**
  * Save a history file to the history_files directory.
  */
 export async function saveHistory(fname: string, history: iface.temporal.api.history.v1.IHistory): Promise<void> {
   const fpath = path.resolve(__dirname, `../history_files/${fname}`);
-  await fs.writeFile(fpath, historyToJSON(history));
+  return saveHistoryBase(fpath, history);
 }

packages/test/src/test-ephemeral-server.ts

@@ -4,15 +4,22 @@ import { v4 as uuid4 } from 'uuid';
 import { bundleWorkflowCode, WorkflowBundle } from '@temporalio/worker';
 import { Connection } from '@temporalio/client';
 import { TestWorkflowEnvironment as RealTestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker, TestWorkflowEnvironment, testTimeSkipping as anyTestTimeSkipping, getRandomPort } from './helpers';
+import {
+  Worker,
+  TestWorkflowEnvironment,
+  RUN_TIME_SKIPPING_TESTS,
+  noopTest,
+  test as testFromHelpers,
+  getRandomPort,
+} from './helpers';
 
 interface Context {
   bundle: WorkflowBundle;
   taskQueue: string;
 }
 
 const test = anyTest as TestFn<Context>;
-const testTimeSkipping = anyTestTimeSkipping as TestFn<Context>;
+const testTimeSkipping = (RUN_TIME_SKIPPING_TESTS ? testFromHelpers : noopTest) as TestFn<Context>;
 
 test.before(async (t) => {
   t.context.bundle = await bundleWorkflowCode({ workflowsPath: require.resolve('./workflows') });

…ng/src/__tests__/test-testenvironment.ts …src/test-testenvironment-timeskipping.tspackages/testing/src/__tests__/test-testenvironment.ts renamed to packages/test/src/test-testenvironment-timeskipping.ts packages/testing/src/__tests__/test-testenvironment.ts renamed to packages/test/src/test-testenvironment-timeskipping.ts

@@ -1,9 +1,10 @@
 import * as process from 'process';
-import ava, { TestFn } from 'ava';
+import { TestFn } from 'ava';
 import { v4 as uuid4 } from 'uuid';
 import { WorkflowFailedError } from '@temporalio/client';
-import { bundleWorkflowCode, Worker, WorkflowBundleWithSourceMap } from '@temporalio/worker';
-import { TestWorkflowEnvironment, workflowInterceptorModules } from '..';
+import { bundleWorkflowCode, WorkflowBundleWithSourceMap } from '@temporalio/worker';
+import { workflowInterceptorModules } from '@temporalio/testing';
+import { RUN_TIME_SKIPPING_TESTS, test, noopTest, Worker, TestWorkflowEnvironment } from './helpers';
 import {
   assertFromWorkflow,
   asyncChildStarter,
@@ -13,17 +14,6 @@ import {
   waitOnSignalWithTimeout,
 } from './workflows/testenv-test-workflows';
 
-// Time-skipping tests are not supported on Linux ARM64
-const RUN_TIME_SKIPPING_TESTS = !(process.platform === 'linux' && process.arch === 'arm64');
-
-function noopTest(): void {
-  // eslint: this function body is empty and it's okay.
-}
-noopTest.serial = () => undefined;
-noopTest.before = () => undefined;
-noopTest.after = Object.assign(() => undefined, { always: () => undefined });
-
-const test: TestFn<unknown> = ava;
 const testTimeSkipping = RUN_TIME_SKIPPING_TESTS ? test : (noopTest as unknown as typeof test);
 
 interface Context {