reduce changes

Author: chris-olszewski

CONTRIBUTING.md

@@ -13,6 +13,7 @@
   - [Working with Individual Packages](#working-with-individual-packages)
   - [Testing](#testing)
     - [Testing local changes to core](#testing-local-changes-to-core)
+    - [Integration tests](#integration-tests)
     - [test-npm-init](#test-npm-init)
   - [Style Guide](#style-guide)
 - [Updating and pruning dependencies](#updating-and-pruning-dependencies)
@@ -44,7 +45,7 @@ However, we recommend using the [Active LTS](https://nodejs.org/en/about/previou
 for SDK development. For easier testing during development, you may want to use
 a version manager, such as [fnm](https://github.com/Schniz/fnm) or [nvm](https://github.com/nvm-sh/nvm/blob/master/README.md).
 
-1. To run integration tests, you will need a local Temporal server. The easiest way is using the
+1. To run tests, you will need access to a local Temporal server, e.g. using the
    [Temporal CLI's integrated dev server](https://github.com/temporalio/cli#start-the-server).
 2. Install the [Rust toolchain](https://rustup.rs/).
 3. Install [Protocol Buffers](https://github.com/protocolbuffers/protobuf/releases/).
@@ -133,20 +134,10 @@ described [here](https://doc.rust-lang.org/cargo/reference/overriding-dependenci
 
 #### Integration tests
 
-Integration tests require a running Temporal server. By default, tests will start an ephemeral
-server automatically using the Temporal CLI.
+In order to run integration tests:
 
-To run tests against an existing server instead, set the `TEMPORAL_SERVICE_ADDRESS` environment variable:
-
-```sh
-export TEMPORAL_SERVICE_ADDRESS=localhost:7233
-```
-
-To skip integration tests entirely, set:
-
-```sh
-export RUN_INTEGRATION_TESTS=false
-```
+1. Run the Temporal server, e.g. using the [Temporal CLI's integrated dev server](https://github.com/temporalio/cli#start-the-server)
+1. Export `RUN_INTEGRATION_TESTS=true`
 
 #### test-npm-init
 

packages/test/src/test-testenvironment.ts

@@ -2,9 +2,8 @@ import * as process from 'process';
 import { TestFn } from 'ava';
 import { v4 as uuid4 } from 'uuid';
 import { WorkflowFailedError } from '@temporalio/client';
-import { bundleWorkflowCode, WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { workflowInterceptorModules } from '@temporalio/testing';
-import { Worker, TestWorkflowEnvironment, testTimeSkipping } from './helpers';
+import { bundleWorkflowCode, WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import {
   assertFromWorkflow,
   asyncChildStarter,
@@ -13,15 +12,16 @@ import {
   unblockSignal,
   waitOnSignalWithTimeout,
 } from './workflows/testenv-test-workflows';
+import { Worker, TestWorkflowEnvironment, testTimeSkipping as anyTestTimeSkipping } from './helpers';
 
 interface Context {
   testEnv: TestWorkflowEnvironment;
   bundle: WorkflowBundleWithSourceMap;
 }
 
-const test_ = testTimeSkipping as TestFn<Context>;
+const testTimeSkipping = anyTestTimeSkipping as TestFn<Context>;
 
-test_.before(async (t) => {
+testTimeSkipping.before(async (t) => {
   t.context = {
     testEnv: await TestWorkflowEnvironment.createTimeSkipping(),
     bundle: await bundleWorkflowCode({
@@ -31,28 +31,31 @@ test_.before(async (t) => {
   };
 });
 
-test_.after.always(async (t) => {
+testTimeSkipping.after.always(async (t) => {
   await t.context.testEnv?.teardown();
 });
 
-test_.serial('TestEnvironment sets up test server and is able to run a Workflow with time skipping', async (t) => {
-  const { client, nativeConnection } = t.context.testEnv;
-  const worker = await Worker.create({
-    connection: nativeConnection,
-    taskQueue: 'test',
-    workflowBundle: t.context.bundle,
-  });
-  await worker.runUntil(
-    client.workflow.execute(sleep, {
-      workflowId: uuid4(),
+testTimeSkipping.serial(
+  'TestEnvironment sets up test server and is able to run a Workflow with time skipping',
+  async (t) => {
+    const { client, nativeConnection } = t.context.testEnv;
+    const worker = await Worker.create({
+      connection: nativeConnection,
       taskQueue: 'test',
-      args: [1_000_000],
-    })
-  );
-  t.pass();
-});
+      workflowBundle: t.context.bundle,
+    });
+    await worker.runUntil(
+      client.workflow.execute(sleep, {
+        workflowId: uuid4(),
+        taskQueue: 'test',
+        args: [1_000_000],
+      })
+    );
+    t.pass();
+  }
+);
 
-test_.serial('TestEnvironment can toggle between normal and skipped time', async (t) => {
+testTimeSkipping.serial('TestEnvironment can toggle between normal and skipped time', async (t) => {
   const { client, nativeConnection } = t.context.testEnv;
 
   const worker = await Worker.create({
@@ -78,7 +81,7 @@ test_.serial('TestEnvironment can toggle between normal and skipped time', async
   t.pass();
 });
 
-test_.serial('TestEnvironment sleep can be used to delay activity completion', async (t) => {
+testTimeSkipping.serial('TestEnvironment sleep can be used to delay activity completion', async (t) => {
   const { client, nativeConnection, sleep } = t.context.testEnv;
 
   const worker = await Worker.create({
@@ -107,7 +110,7 @@ test_.serial('TestEnvironment sleep can be used to delay activity completion', a
   t.pass();
 });
 
-test_.serial('TestEnvironment sleep can be used to delay sending a signal', async (t) => {
+testTimeSkipping.serial('TestEnvironment sleep can be used to delay sending a signal', async (t) => {
   const { client, nativeConnection, sleep } = t.context.testEnv;
 
   const worker = await Worker.create({
@@ -128,7 +131,7 @@ test_.serial('TestEnvironment sleep can be used to delay sending a signal', asyn
   t.pass();
 });
 
-test_.serial('Workflow code can run assertions', async (t) => {
+testTimeSkipping.serial('Workflow code can run assertions', async (t) => {
   const { client, nativeConnection } = t.context.testEnv;
 
   const worker = await Worker.create({
@@ -150,7 +153,7 @@ test_.serial('Workflow code can run assertions', async (t) => {
   t.is(err?.cause?.message, 'Expected values to be strictly equal:\n\n6 !== 7\n');
 });
 
-test_.serial('ABNADONED child timer can be fast-forwarded', async (t) => {
+testTimeSkipping.serial('ABNADONED child timer can be fast-forwarded', async (t) => {
   const { client, nativeConnection } = t.context.testEnv;
 
   const worker = await Worker.create({