Merge c0fdc44 into d9c43c5

jest-community · Apr 30, 2023 · 4823c48 · 4823c48
2 parents d9c43c5 + c0fdc44
commit 4823c48
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -7,4 +7,4 @@
     "allowSyntheticDefaultImports": true
   },
   "exclude": ["node_modules", "bower_components", "jspm_packages", "tmp", "temp"]
-}
+}
diff --git a/src/TestResults/match-by-context.ts b/src/TestResults/match-by-context.ts
@@ -71,7 +71,10 @@ export const buildSourceContainer = (sourceRoot: ParsedNode): ContainerNode<ItBl
     let container = parent;
     const attrs = (namedNode: NamedBlock): OptionalAttributes => ({
       isGroup: namedNode.lastProperty === 'each' ? 'yes' : 'no',
-      nonLiteralName: namedNode.nameType !== 'Literal',
+      // TODO: we could probably remove the checking for 'Literal' after a while. This was probably produced by the older version of the babel-parser
+      nonLiteralName: !(
+        namedNode.nameType && ['StringLiteral', 'Literal'].includes(namedNode.nameType)
+      ),
       range: {
         start: namedNode.start ? adjustLocation(namedNode.start) : UnknownRange.start,
         end: namedNode.end ? adjustLocation(namedNode.end) : UnknownRange.end,

diff --git a/tests/TestResults/match-by-context.test.ts b/tests/TestResults/match-by-context.test.ts
@@ -148,6 +148,22 @@ describe('buildSourceContainer', () => {
     expect(root.childData.map((n) => (n as any).name)).toEqual(['test-1', 'test-2']);
     expect(root.childContainers).toHaveLength(0);
   });
+  describe('can properly populate nonLiteralName for source blocks', () => {
+    it.each`
+      nameType             | nonLiteralName
+      ${null}              | ${true}
+      ${''}                | ${true}
+      ${'TemplateLiteral'} | ${true}
+      ${'Whatever'}        | ${true}
+      ${'Literal'}         | ${false}
+      ${'StringLiteral'}   | ${false}
+    `('$nameType => nonLiteralName? $inonLiteralName', ({ nameType, nonLiteralName }) => {
+      const t1 = helper.makeItBlock('test-1', [1, 0, 5, 0], { nameType });
+      const sourceRoot = helper.makeRoot([t1]);
+      const root = match.buildSourceContainer(sourceRoot);
+      expect(root.childData.map((n) => (n as any).attrs.nonLiteralName)).toEqual([nonLiteralName]);
+    });
+  });
 });
 describe('matchTestAssertions', () => {
   const mockError = jest.fn();