@checkdigit/eslint-plugin 7.6.0-PR.75-4751 → 7.6.0-PR.75-a611

package/src/agent/no-fixture.ts

@@ -9,110 +9,60 @@
 import { strict as assert } from 'node:assert';
 
 import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils';
-import type { Scope, ScopeManager, Variable } from '@typescript-eslint/scope-manager';
 import type { SourceCode } from '@typescript-eslint/utils/ts-eslint';
 
-import {
-  getEnclosingFunction,
-  getEnclosingScopeNode,
-  getEnclosingStatement,
-  getParent,
-  isUsedInArrayOrAsArgument,
-} from '../library/ts-tree';
+import { getParent } from '../library/ts-tree';
 import getDocumentationUrl from '../get-documentation-url';
 import { getIndentation } from '../library/format';
 import { isValidPropertyName } from '../library/variable';
-import { analyzeResponseReferences } from './response-reference';
-import {
-  getResponseBodyRetrievalText,
-  getResponseHeadersRetrievalText,
-  getResponseStatusRetrievalText,
-  hasAssertions,
-} from './fetch';
 import { replaceEndpointUrlPrefixWithBasePath } from './url';
 
 export const ruleId = 'no-fixture';
 
 interface FixtureCallInformation {
-  rootNode:
-    | TSESTree.AwaitExpression
-    | TSESTree.ReturnStatement
-    | TSESTree.VariableDeclaration
-    | TSESTree.CallExpression
-    | TSESTree.ExpressionStatement;
-  fixtureNode: TSESTree.AwaitExpression | TSESTree.CallExpression;
-  variableDeclaration?: TSESTree.VariableDeclaration;
-  variableAssignment?: TSESTree.ExpressionStatement;
+  fixtureNode: TSESTree.CallExpression;
   requestBody?: TSESTree.Expression;
   requestHeaders?: { name: TSESTree.Expression; value: TSESTree.Expression }[];
   requestHeadersObjectLiteral?: TSESTree.ObjectExpression;
-  assertions?: TSESTree.Expression[][];
-  inlineStatementNode?: TSESTree.Node;
-  inlineBodyReference?: TSESTree.MemberExpression;
-  inlineStatusReference?: TSESTree.MemberExpression;
-  inlineHeadersReference?: TSESTree.MemberExpression;
+  statusAssertion?: TSESTree.CallExpressionArgument[];
+  nonStatusAssertions?: TSESTree.CallExpressionArgument[][];
+}
+
+function isStatusAssertion(expectArguments: TSESTree.CallExpressionArgument[]) {
+  if (expectArguments.length === 1) {
+    const [maybeStatusAssertion] = expectArguments;
+    assert.ok(maybeStatusAssertion);
+    if (
+      (maybeStatusAssertion.type === AST_NODE_TYPES.MemberExpression &&
+        maybeStatusAssertion.object.type === AST_NODE_TYPES.Identifier &&
+        maybeStatusAssertion.object.name === 'StatusCodes') ||
+      (maybeStatusAssertion.type === AST_NODE_TYPES.Literal && typeof maybeStatusAssertion.value === 'number')
+    ) {
+      return true;
+    }
+  }
+  return false;
 }
 
 // recursively analyze the fixture/supertest call chain to collect information of request/response
-// eslint-disable-next-line sonarjs/cognitive-complexity
 function analyzeFixtureCall(call: TSESTree.CallExpression, results: FixtureCallInformation, sourceCode: SourceCode) {
+  sourceCode.getText(call);
+  results.fixtureNode = call;
+
+  let nextCall;
   const parent = getParent(call);
   assert.ok(parent, 'parent should exist for fixture/supertest call node');
 
-  let nextCall;
-  if (parent.type === AST_NODE_TYPES.ReturnStatement) {
-    // direct return, no variable declaration or await
-    results.fixtureNode = call;
-    results.rootNode = parent;
-  } else if (
-    parent.type === AST_NODE_TYPES.ArrayExpression ||
-    parent.type === AST_NODE_TYPES.CallExpression ||
-    parent.type === AST_NODE_TYPES.ArrowFunctionExpression
-  ) {
-    // direct return, no variable declaration or await
-    results.fixtureNode = call;
-    results.rootNode = call;
-  } else if (parent.type === AST_NODE_TYPES.AwaitExpression) {
-    results.fixtureNode = call;
-    const enclosingStatement = getEnclosingStatement(parent);
-    assert.ok(enclosingStatement);
-    const awaitParent = getParent(parent);
-    if (awaitParent?.type === AST_NODE_TYPES.MemberExpression) {
-      results.rootNode = parent;
-      results.inlineStatementNode = enclosingStatement;
-      if (awaitParent.property.type === AST_NODE_TYPES.Identifier && awaitParent.property.name === 'body') {
-        results.inlineBodyReference = awaitParent;
-      }
-      if (
-        awaitParent.property.type === AST_NODE_TYPES.Identifier &&
-        (awaitParent.property.name === 'status' || awaitParent.property.name === 'statusCode')
-      ) {
-        results.inlineStatusReference = awaitParent;
-      }
-      if (
-        awaitParent.property.type === AST_NODE_TYPES.Identifier &&
-        (awaitParent.property.name === 'header' || awaitParent.property.name === 'headers')
-      ) {
-        results.inlineHeadersReference = awaitParent;
-      }
-    } else if (enclosingStatement.type === AST_NODE_TYPES.VariableDeclaration) {
-      results.variableDeclaration = enclosingStatement;
-      results.rootNode = enclosingStatement;
-    } else if (
-      enclosingStatement.type === AST_NODE_TYPES.ExpressionStatement &&
-      enclosingStatement.expression.type === AST_NODE_TYPES.AssignmentExpression
-    ) {
-      results.variableAssignment = enclosingStatement;
-      results.rootNode = enclosingStatement;
-    } else {
-      results.rootNode = parent;
-    }
-  } else if (parent.type === AST_NODE_TYPES.MemberExpression && parent.property.type === AST_NODE_TYPES.Identifier) {
+  if (parent.type === AST_NODE_TYPES.MemberExpression && parent.property.type === AST_NODE_TYPES.Identifier) {
     if (parent.property.name === 'expect') {
       // supertest assertions
       const assertionCall = getParent(parent);
       assert.ok(assertionCall && assertionCall.type === AST_NODE_TYPES.CallExpression);
-      results.assertions = [...(results.assertions ?? []), assertionCall.arguments as TSESTree.Expression[]];
+      if (isStatusAssertion(assertionCall.arguments)) {
+        results.statusAssertion = assertionCall.arguments;
+      } else {
+        results.nonStatusAssertions = [...(results.nonStatusAssertions ?? []), assertionCall.arguments];
+      }
       nextCall = assertionCall;
     } else if (parent.property.name === 'send') {
       // request body
@@ -132,162 +82,14 @@ function analyzeFixtureCall(call: TSESTree.CallExpression, results: FixtureCallI
       }
       nextCall = setRequestHeaderCall;
     }
-  } else {
-    throw new Error(`Unexpected expression in fixture/supertest call ${sourceCode.getText(parent)}.`);
   }
   if (nextCall) {
     analyzeFixtureCall(nextCall, results, sourceCode);
   }
 }
 
-// eslint-disable-next-line sonarjs/cognitive-complexity
-function createResponseAssertions(
-  fixtureCallInformation: FixtureCallInformation,
-  sourceCode: SourceCode,
-  responseVariableName: string,
-  destructuringResponseHeadersVariable: Variable | undefined,
-) {
-  let statusAssertion: string | undefined;
-  const nonStatusAssertions: string[] = [];
-  for (const expectArguments of fixtureCallInformation.assertions ?? []) {
-    if (expectArguments.length === 1) {
-      const [assertionArgument] = expectArguments;
-      assert.ok(assertionArgument);
-      if (
-        (assertionArgument.type === AST_NODE_TYPES.MemberExpression &&
-          assertionArgument.object.type === AST_NODE_TYPES.Identifier &&
-          assertionArgument.object.name === 'StatusCodes') ||
-        assertionArgument.type === AST_NODE_TYPES.Literal ||
-        sourceCode.getText(assertionArgument as TSESTree.Node).includes('StatusCodes.')
-      ) {
-        // status code assertion
-        statusAssertion = `assert.equal(${responseVariableName}.status, ${sourceCode.getText(assertionArgument)})`;
-      } else if (assertionArgument.type === AST_NODE_TYPES.ArrowFunctionExpression) {
-        // callback assertion using arrow function
-        let functionBody = sourceCode.getText(assertionArgument.body);
-
-        const [originalResponseArgument] = assertionArgument.params;
-        assert.ok(originalResponseArgument?.type === AST_NODE_TYPES.Identifier);
-        const originalResponseArgumentName = originalResponseArgument.name;
-        if (originalResponseArgumentName !== responseVariableName) {
-          functionBody = functionBody.replace(
-            new RegExp(`\\b${originalResponseArgumentName}\\b`, 'ug'),
-            responseVariableName,
-          );
-        }
-        nonStatusAssertions.push(`assert.doesNotThrow(()=>${functionBody})`);
-      } else if (assertionArgument.type === AST_NODE_TYPES.Identifier) {
-        // callback assertion using function reference
-        nonStatusAssertions.push(
-          `assert.doesNotThrow(()=>${sourceCode.getText(assertionArgument)}(${responseVariableName}))`,
-        );
-      } else if (
-        assertionArgument.type === AST_NODE_TYPES.ObjectExpression ||
-        assertionArgument.type === AST_NODE_TYPES.CallExpression
-      ) {
-        // body deep equal assertion
-        nonStatusAssertions.push(
-          `assert.deepEqual(await ${responseVariableName}.json(), ${sourceCode.getText(assertionArgument)})`,
-        );
-      } else {
-        throw new Error(`Unexpected Supertest assertion argument: ".expect(${sourceCode.getText(assertionArgument)})`);
-      }
-    } else if (expectArguments.length === 2) {
-      // header assertion
-      const [headerName, headerValue] = expectArguments;
-      assert.ok(headerName && headerValue);
-      const headersReference =
-        destructuringResponseHeadersVariable !== undefined
-          ? destructuringResponseHeadersVariable.name
-          : `${responseVariableName}.headers`;
-      if (headerValue.type === AST_NODE_TYPES.Literal && headerValue.value instanceof RegExp) {
-        nonStatusAssertions.push(
-          `assert.ok(${headersReference}.get(${sourceCode.getText(headerName)}).match(${sourceCode.getText(headerValue)}))`,
-        );
-      } else {
-        nonStatusAssertions.push(
-          `assert.equal(${headersReference}.get(${sourceCode.getText(headerName)}), ${sourceCode.getText(headerValue)})`,
-        );
-      }
-    }
-  }
-  return {
-    statusAssertion,
-    nonStatusAssertions,
-  };
-}
-
-function getResponseVariableNameToUse(
-  methodName: string,
-  urlArgumentNode: TSESTree.CallExpressionArgument,
-  originalUrlArgumentText: string,
-  scopeManager: ScopeManager,
-  fixtureCallInformation: FixtureCallInformation,
-  scopeVariablesMap: Map<Scope, string[]>,
-) {
-  if (fixtureCallInformation.variableAssignment) {
-    assert.ok(
-      fixtureCallInformation.variableAssignment.expression.type === AST_NODE_TYPES.AssignmentExpression &&
-        fixtureCallInformation.variableAssignment.expression.left.type === AST_NODE_TYPES.Identifier,
-    );
-    return fixtureCallInformation.variableAssignment.expression.left.name;
-  }
-
-  if (fixtureCallInformation.variableDeclaration) {
-    const firstDeclaration = fixtureCallInformation.variableDeclaration.declarations[0];
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (firstDeclaration !== undefined && firstDeclaration.id.type === AST_NODE_TYPES.Identifier) {
-      return firstDeclaration.id.name;
-    }
-  }
-
-  const enclosingScopeNode = getEnclosingScopeNode(fixtureCallInformation.rootNode);
-  scopeManager.getDeclaredVariables(fixtureCallInformation.rootNode);
-  assert.ok(enclosingScopeNode);
-  const scope = scopeManager.acquire(enclosingScopeNode);
-  assert.ok(scope !== null);
-  let scopeVariables = scopeVariablesMap.get(scope);
-  if (!scopeVariables) {
-    scopeVariables = [...scope.set.keys()];
-    scopeVariablesMap.set(scope, scopeVariables);
-  }
-
-  let responseVariableNameBase = 'response';
-  if (urlArgumentNode.type === AST_NODE_TYPES.Literal || urlArgumentNode.type === AST_NODE_TYPES.TemplateLiteral) {
-    const urlWithoutQuotes = originalUrlArgumentText.replace(/['"`]/gu, '');
-    const urlWithoutQuery = urlWithoutQuotes.includes('?')
-      ? urlWithoutQuotes.slice(0, urlWithoutQuotes.indexOf('?'))
-      : urlWithoutQuotes;
-    const parts = urlWithoutQuery.startsWith('${')
-      ? urlWithoutQuery.split('/').slice(1)
-      : // eslint-disable-next-line no-magic-numbers
-        urlWithoutQuery.split('/').slice(3);
-
-    responseVariableNameBase = [...parts.filter((part) => part !== 'tenant'), methodName.toLocaleLowerCase()]
-      .map((part) => part.split(/[-]/u))
-      .flat()
-      .filter((part) => part.trim() !== '' && !/\$\{.*\}/u.test(part)) // keep only non-empty parts that are not path parameters
-      .map((part) => `${part[0]?.toUpperCase() ?? ''}${part.slice(1)}`)
-      .join('');
-    responseVariableNameBase = `${responseVariableNameBase[0]?.toLowerCase() ?? ''}${responseVariableNameBase.slice(1)}Response`;
-  }
-
-  let responseVariableCounter = 0;
-  let responseVariableNameToUse;
-  while (responseVariableNameToUse === undefined) {
-    responseVariableNameToUse = `${responseVariableNameBase}${responseVariableCounter === 0 ? '' : responseVariableCounter.toString()}`;
-    if (scopeVariables.includes(responseVariableNameToUse)) {
-      responseVariableNameToUse = undefined;
-    }
-    responseVariableCounter++;
-  }
-  scopeVariables.push(responseVariableNameToUse);
-  return responseVariableNameToUse;
-}
-
-function isResponseBodyRedefinition(responseBodyReference: TSESTree.MemberExpression): boolean {
-  const parent = getParent(responseBodyReference);
-  return parent?.type === AST_NODE_TYPES.VariableDeclarator && parent.id.type === AST_NODE_TYPES.Identifier;
+function getExpectAssertion(expectArguments: TSESTree.CallExpressionArgument[], sourceCode: SourceCode) {
+  return `expect(${expectArguments.map((arg) => sourceCode.getText(arg)).join(', ')})`;
 }
 
 const createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
@@ -308,28 +110,16 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
     schema: [],
   },
   defaultOptions: [],
-  // eslint-disable-next-line max-lines-per-function
   create(context) {
     const sourceCode = context.sourceCode;
     const scopeManager = sourceCode.scopeManager;
     assert.ok(scopeManager !== null);
-    const scopeVariablesMap = new Map<Scope, string[]>();
 
     return {
-      // eslint-disable-next-line max-lines-per-function
       'CallExpression[callee.object.object.name="fixture"][callee.object.property.name="api"]': (
         fixtureCall: TSESTree.CallExpression,
-        // eslint-disable-next-line sonarjs/cognitive-complexity
       ) => {
         try {
-          if (
-            hasAssertions(fixtureCall) &&
-            (isUsedInArrayOrAsArgument(fixtureCall) || getEnclosingFunction(fixtureCall)?.async === false)
-          ) {
-            // skip and leave it to "fetch-then" rule to handle it because no "await" can be used here
-            return;
-          }
-
           const fixtureFunction = fixtureCall.callee; // e.g. fixture.api.get
           assert.ok(fixtureFunction.type === AST_NODE_TYPES.MemberExpression);
           const indentation = getIndentation(fixtureCall, sourceCode);
@@ -340,16 +130,6 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
           const fixtureCallInformation = {} as FixtureCallInformation;
           analyzeFixtureCall(fixtureCall, fixtureCallInformation, sourceCode);
 
-          const {
-            variable: responseVariable,
-            bodyReferences: responseBodyReferences,
-            // headersReferences: responseHeadersReferences,
-            statusReferences: responseStatusReferences,
-            destructuringBodyVariable: destructuringResponseBodyVariable,
-            destructuringStatusVariable: destructuringResponseStatusVariable,
-            destructuringHeadersVariable: destructuringResponseHeadersVariable,
-          } = analyzeResponseReferences(fixtureCallInformation.variableDeclaration, scopeManager);
-
           // convert url from `/sample-service/v1/ping` to `${BASE_PATH}/ping`
           const originalUrlArgumentText = sourceCode.getText(urlArgumentNode);
           const fetchUrlArgumentText = replaceEndpointUrlPrefixWithBasePath(originalUrlArgumentText);
@@ -383,182 +163,24 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
             '}',
           ].join(`\n${indentation}`);
 
-          const responseVariableNameToUse = getResponseVariableNameToUse(
-            methodNameToUse,
-            urlArgumentNode,
-            originalUrlArgumentText,
-            scopeManager,
-            fixtureCallInformation,
-            scopeVariablesMap,
-          );
-
-          const isResponseBodyVariableRedefinitionNeeded =
-            destructuringResponseBodyVariable !== undefined ||
-            fixtureCallInformation.inlineBodyReference !== undefined ||
-            (responseBodyReferences.length > 0 && !responseBodyReferences.some(isResponseBodyRedefinition));
-          const redefineResponseBodyVariableName = `${responseVariableNameToUse}Body`;
-
-          const isResponseStatusVariableRedefinitionNeeded =
-            destructuringResponseStatusVariable !== undefined ||
-            fixtureCallInformation.inlineStatusReference !== undefined;
-          const redefineResponseStatusVariableName = `${responseVariableNameToUse}Status`;
-
-          const isResponseHeadersVariableRedefinitionNeeded =
-            (destructuringResponseHeadersVariable !== undefined &&
-              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              (destructuringResponseHeadersVariable as TSESTree.ObjectPattern).type === AST_NODE_TYPES.ObjectPattern) ||
-            fixtureCallInformation.inlineHeadersReference !== undefined;
-          const redefineResponseHeadersVariableName = `${responseVariableNameToUse}Headers`;
-
-          const isResponseVariableRedefinitionNeeded =
-            (fixtureCallInformation.variableAssignment === undefined &&
-              responseVariable === undefined &&
-              fixtureCallInformation.assertions !== undefined) ||
-            isResponseBodyVariableRedefinitionNeeded ||
-            isResponseStatusVariableRedefinitionNeeded ||
-            isResponseHeadersVariableRedefinitionNeeded;
-
-          const responseBodyHeadersVariableRedefineLines = isResponseVariableRedefinitionNeeded
-            ? [
-                // eslint-disable-next-line no-nested-ternary
-                ...(destructuringResponseBodyVariable
-                  ? [
-                      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                      `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${(destructuringResponseBodyVariable as TSESTree.ObjectPattern).type === AST_NODE_TYPES.ObjectPattern ? sourceCode.getText(destructuringResponseBodyVariable as TSESTree.ObjectPattern) : (destructuringResponseBodyVariable as Variable).name} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`,
-                    ]
-                  : isResponseBodyVariableRedefinitionNeeded
-                    ? [
-                        `const ${redefineResponseBodyVariableName} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`,
-                      ]
-                    : []),
-                // eslint-disable-next-line no-nested-ternary
-                ...(destructuringResponseStatusVariable
-                  ? [
-                      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                      `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${(destructuringResponseStatusVariable as TSESTree.ObjectPattern).type === AST_NODE_TYPES.ObjectPattern ? sourceCode.getText(destructuringResponseStatusVariable as TSESTree.ObjectPattern) : (destructuringResponseStatusVariable as Variable).name} = ${getResponseStatusRetrievalText(responseVariableNameToUse)}`,
-                    ]
-                  : isResponseStatusVariableRedefinitionNeeded
-                    ? [
-                        `const ${redefineResponseStatusVariableName} = ${getResponseStatusRetrievalText(responseVariableNameToUse)}`,
-                      ]
-                    : []),
-                // eslint-disable-next-line no-nested-ternary
-                ...(destructuringResponseHeadersVariable
-                  ? // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                    (destructuringResponseHeadersVariable as TSESTree.ObjectPattern).type ===
-                    AST_NODE_TYPES.ObjectPattern
-                    ? (destructuringResponseHeadersVariable as TSESTree.ObjectPattern).properties.map((property) => {
-                        assert.ok(property.type === AST_NODE_TYPES.Property);
-                        assert.equal(property.value.type, AST_NODE_TYPES.Identifier);
-                        // eslint-disable-next-line sonarjs/no-nested-template-literals
-                        return `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${property.value.name} = ${getResponseHeadersRetrievalText(responseVariableNameToUse)}.get(${property.key.type === AST_NODE_TYPES.Literal ? sourceCode.getText(property.key) : `'${sourceCode.getText(property.key)}'`})`;
-                      })
-                    : [
-                        `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${(destructuringResponseHeadersVariable as Variable).name} = ${getResponseHeadersRetrievalText(responseVariableNameToUse)}`,
-                      ]
-                  : isResponseHeadersVariableRedefinitionNeeded
-                    ? [
-                        `const ${redefineResponseHeadersVariableName} = ${getResponseHeadersRetrievalText(responseVariableNameToUse)}`,
-                      ]
-                    : []),
-              ]
-            : [];
-
-          const { statusAssertion, nonStatusAssertions } = createResponseAssertions(
-            fixtureCallInformation,
-            sourceCode,
-            responseVariableNameToUse,
-            destructuringResponseHeadersVariable as Variable | undefined,
-          );
-
-          // add variable declaration if needed
           const fetchCallText = `fetch(${fetchUrlArgumentText}, ${fetchRequestArgumentLines})`;
-          const fetchStatementText = !isResponseVariableRedefinitionNeeded
-            ? fetchCallText
-            : `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${responseVariableNameToUse} = await ${fetchCallText}`;
-
-          const nodeToReplace = isResponseVariableRedefinitionNeeded
-            ? fixtureCallInformation.rootNode
-            : fixtureCallInformation.fixtureNode;
-          const appendingAssignmentAndAssertionText = [
-            '',
-            ...(statusAssertion !== undefined ? [statusAssertion] : []),
-            ...responseBodyHeadersVariableRedefineLines,
-            ...nonStatusAssertions,
-          ].join(`;\n${indentation}`);
+          const fetchStatementText = [
+            fetchCallText,
+            ...(fixtureCallInformation.statusAssertion === undefined
+              ? []
+              : [getExpectAssertion(fixtureCallInformation.statusAssertion, sourceCode)]),
+            ...(fixtureCallInformation.nonStatusAssertions === undefined
+              ? []
+              : fixtureCallInformation.nonStatusAssertions.map((assertion) =>
+                  getExpectAssertion(assertion, sourceCode),
+                )),
+          ].join(`\n${indentation}.`);
 
           context.report({
-            node: fixtureCall,
+            node: fixtureCallInformation.fixtureNode,
             messageId: 'preferNativeFetch',
-
-            *fix(fixer) {
-              if (fixtureCallInformation.inlineStatementNode) {
-                const preInlineDeclaration = [
-                  fetchStatementText,
-                  `${appendingAssignmentAndAssertionText};\n${indentation}`,
-                ].join(``);
-                yield fixer.insertTextBefore(fixtureCallInformation.inlineStatementNode, preInlineDeclaration);
-              } else {
-                yield fixer.replaceText(nodeToReplace, fetchStatementText);
-
-                const needEndingSemiColon = sourceCode.getText(nodeToReplace).endsWith(';');
-                yield fixer.insertTextAfter(
-                  nodeToReplace,
-                  needEndingSemiColon ? `${appendingAssignmentAndAssertionText};` : appendingAssignmentAndAssertionText,
-                );
-              }
-
-              // handle response body references
-              for (const responseBodyReference of responseBodyReferences) {
-                yield fixer.replaceText(
-                  responseBodyReference,
-                  isResponseBodyVariableRedefinitionNeeded || !isResponseBodyRedefinition(responseBodyReference)
-                    ? redefineResponseBodyVariableName
-                    : getResponseBodyRetrievalText(responseVariableNameToUse),
-                );
-              }
-              if (fixtureCallInformation.inlineBodyReference) {
-                yield fixer.replaceText(fixtureCallInformation.inlineBodyReference, redefineResponseBodyVariableName);
-              }
-
-              // // handle response headers references
-              // for (const responseHeadersReference of responseHeadersReferences) {
-              //   const parent = getParent(responseHeadersReference);
-              //   assert.ok(parent);
-              //   let headerName;
-              //   if (parent.type === AST_NODE_TYPES.MemberExpression) {
-              //     const headerNameNode = parent.property;
-              //     headerName = parent.computed
-              //       ? sourceCode.getText(headerNameNode)
-              //       : `'${sourceCode.getText(headerNameNode)}'`;
-              //   } else if (parent.type === AST_NODE_TYPES.CallExpression) {
-              //     const headerNameNode = parent.arguments[0];
-              //     headerName = sourceCode.getText(headerNameNode);
-              //   }
-              //   assert.ok(headerName !== undefined);
-              //   yield fixer.replaceText(parent, `${responseVariableNameToUse}.headers.get(${headerName})`);
-              // }
-
-              // convert response.statusCode to response.status
-              for (const responseStatusReference of responseStatusReferences) {
-                if (
-                  responseStatusReference.property.type === AST_NODE_TYPES.Identifier &&
-                  responseStatusReference.property.name === 'statusCode'
-                ) {
-                  yield fixer.replaceText(responseStatusReference.property, `status`);
-                }
-              }
-
-              // handle direct return statement without await, e.g. "return fixture.api.get(...);"
-              if (
-                fixtureCallInformation.rootNode.type === AST_NODE_TYPES.ReturnStatement &&
-                fixtureCallInformation.assertions !== undefined
-              ) {
-                yield fixer.insertTextAfter(
-                  fixtureCallInformation.rootNode,
-                  `\n${indentation}return ${responseVariableNameToUse};`,
-                );
-              }
+            fix(fixer) {
+              return fixer.replaceText(fixtureCallInformation.fixtureNode, fetchStatementText);
             },
           });
         } catch (error) {

package/src/agent/response-reference.ts

@@ -104,7 +104,7 @@ export function analyzeResponseReferences(
       // header reference through destruction/renaming, e.g. "const { headers } = ..."
       identifierParent.type === AST_NODE_TYPES.Property &&
       identifierParent.key.type === AST_NODE_TYPES.Identifier &&
-      identifierParent.key.name === 'headers'
+      (identifierParent.key.name === 'headers' || identifierParent.key.name === 'header')
     ) {
       results.destructuringHeadersVariable = responseVariable;
       results.destructuringHeadersReferences = responseVariable.references

package/src/index.ts

@@ -15,15 +15,15 @@ import fetchResponseHeaderGetter, {
   ruleId as fetchResponseHeaderGetterRuleId,
 } from './agent/fetch-response-header-getter';
 import fetchResponseStatus, { ruleId as fetchResponseStatusRuleId } from './agent/fetch-response-status';
-import fetchThen, { ruleId as fetchThenRuleId } from './agent/fetch-then';
+// import fetchThen, { ruleId as fetchThenRuleId } from './agent/fetch-then';
 import fixFunctionCallArguments, {
   ruleId as fixFunctionCallArgumentsRuleId,
 } from './agent/fix-function-call-arguments';
 import invalidJsonStringify, { ruleId as invalidJsonStringifyRuleId } from './invalid-json-stringify';
 import noDuplicatedImports, { ruleId as noDuplicatedImportsRuleId } from './no-duplicated-imports';
 import noFixture, { ruleId as noFixtureRuleId } from './agent/no-fixture';
-import noSupertest, { ruleId as noSupertestRuleId } from './agent/no-supertest';
-import supertestThen, { ruleId as supertestThenRuleId } from './agent/supertest-then';
+import noExpectAssertion, { ruleId as noExpectAssertionRuleId } from './agent/no-expect-assertion';
+// import supertestThen, { ruleId as supertestThenRuleId } from './agent/supertest-then';
 import noLegacyServiceTyping, { ruleId as noLegacyServiceTypingRuleId } from './no-legacy-service-typing';
 import noMappedResponse, { ruleId as noMappedResponseRuleId } from './agent/no-mapped-response';
 import noPromiseInstanceMethod, { ruleId as noPromiseInstanceMethodRuleId } from './no-promise-instance-method';
@@ -74,9 +74,9 @@ const rules: Record<string, TSESLint.LooseRuleDefinition> = {
   [invalidJsonStringifyRuleId]: invalidJsonStringify,
   [noPromiseInstanceMethodRuleId]: noPromiseInstanceMethod,
   [noFixtureRuleId]: noFixture,
-  [noSupertestRuleId]: noSupertest,
-  [supertestThenRuleId]: supertestThen,
-  [fetchThenRuleId]: fetchThen,
+  [noExpectAssertionRuleId]: noExpectAssertion,
+  // [supertestThenRuleId]: supertestThen,
+  // [fetchThenRuleId]: fetchThen,
   [noServiceWrapperRuleId]: noServiceWrapper,
   [noStatusCodeRuleId]: noStatusCode,
   [fetchResponseBodyJsonRuleId]: fetchResponseBodyJson,
@@ -135,14 +135,14 @@ const configs: Record<string, TSESLint.FlatConfig.Config[]> = {
         [`@checkdigit/${noMappedResponseRuleId}`]: 'off',
         [`@checkdigit/${addUrlDomainRuleId}`]: 'off',
         [`@checkdigit/${noFixtureRuleId}`]: 'off',
-        [`@checkdigit/${noSupertestRuleId}`]: 'off',
-        [`@checkdigit/${supertestThenRuleId}`]: 'off',
+        [`@checkdigit/${noExpectAssertionRuleId}`]: 'off',
+        // [`@checkdigit/${supertestThenRuleId}`]: 'off',
         [`@checkdigit/${noServiceWrapperRuleId}`]: 'off',
         [`@checkdigit/${noStatusCodeRuleId}`]: 'off',
         [`@checkdigit/${fetchResponseBodyJsonRuleId}`]: 'off',
         [`@checkdigit/${fetchResponseHeaderGetterRuleId}`]: 'off',
         [`@checkdigit/${fetchResponseStatusRuleId}`]: 'off',
-        [`@checkdigit/${fetchThenRuleId}`]: 'off',
+        // [`@checkdigit/${fetchThenRuleId}`]: 'off',
         [`@checkdigit/${noUnusedFunctionArgumentsRuleId}`]: 'off',
         [`@checkdigit/${noUnusedServiceVariablesRuleId}`]: 'off',
         [`@checkdigit/${noUnusedImportsRuleId}`]: 'off',
@@ -185,14 +185,14 @@ const configs: Record<string, TSESLint.FlatConfig.Config[]> = {
         [`@checkdigit/${noMappedResponseRuleId}`]: 'off',
         [`@checkdigit/${addUrlDomainRuleId}`]: 'off',
         [`@checkdigit/${noFixtureRuleId}`]: 'off',
-        [`@checkdigit/${noSupertestRuleId}`]: 'off',
-        [`@checkdigit/${supertestThenRuleId}`]: 'off',
+        [`@checkdigit/${noExpectAssertionRuleId}`]: 'off',
+        // [`@checkdigit/${supertestThenRuleId}`]: 'off',
         [`@checkdigit/${noServiceWrapperRuleId}`]: 'off',
         [`@checkdigit/${noStatusCodeRuleId}`]: 'off',
         [`@checkdigit/${fetchResponseBodyJsonRuleId}`]: 'off',
         [`@checkdigit/${fetchResponseHeaderGetterRuleId}`]: 'off',
         [`@checkdigit/${fetchResponseStatusRuleId}`]: 'off',
-        [`@checkdigit/${fetchThenRuleId}`]: 'off',
+        // [`@checkdigit/${fetchThenRuleId}`]: 'off',
         [`@checkdigit/${noUnusedFunctionArgumentsRuleId}`]: 'off',
         [`@checkdigit/${noUnusedServiceVariablesRuleId}`]: 'off',
         [`@checkdigit/${noUnusedImportsRuleId}`]: 'off',
@@ -221,7 +221,7 @@ const configs: Record<string, TSESLint.FlatConfig.Config[]> = {
         [`@checkdigit/${fetchResponseBodyJsonRuleId}`]: 'error',
         [`@checkdigit/${fetchResponseHeaderGetterRuleId}`]: 'error',
         [`@checkdigit/${fetchResponseStatusRuleId}`]: 'error',
-        [`@checkdigit/${fetchThenRuleId}`]: 'error',
+        // [`@checkdigit/${fetchThenRuleId}`]: 'error',
         [`@checkdigit/${noUnusedFunctionArgumentsRuleId}`]: 'error',
         [`@checkdigit/${noUnusedServiceVariablesRuleId}`]: 'error',
         [`@checkdigit/${noUnusedImportsRuleId}`]: 'error',
@@ -230,8 +230,8 @@ const configs: Record<string, TSESLint.FlatConfig.Config[]> = {
         [`@checkdigit/${addBasePathImportRuleId}`]: 'error',
         [`@checkdigit/${addAssertImportRuleId}`]: 'error',
         [`@checkdigit/${noFixtureRuleId}`]: 'error',
-        [`@checkdigit/${noSupertestRuleId}`]: 'error',
-        [`@checkdigit/${supertestThenRuleId}`]: 'error',
+        [`@checkdigit/${noExpectAssertionRuleId}`]: 'error',
+        // [`@checkdigit/${supertestThenRuleId}`]: 'error',
       },
     },
     {
@@ -260,7 +260,7 @@ const configs: Record<string, TSESLint.FlatConfig.Config[]> = {
         [`@checkdigit/${fetchResponseBodyJsonRuleId}`]: 'error',
         [`@checkdigit/${fetchResponseHeaderGetterRuleId}`]: 'error',
         [`@checkdigit/${fetchResponseStatusRuleId}`]: 'error',
-        [`@checkdigit/${fetchThenRuleId}`]: 'error',
+        // [`@checkdigit/${fetchThenRuleId}`]: 'error',
         [`@checkdigit/${noUnusedFunctionArgumentsRuleId}`]: 'error',
         [`@checkdigit/${noUnusedServiceVariablesRuleId}`]: 'error',
         [`@checkdigit/${noUnusedImportsRuleId}`]: 'error',