Merge pull request #87 from VinceMalone/fix-await-interaction-chain-e…

…xpression fix: support ChainExpression in await-interactions rule
storybookjs · Apr 15, 2022 · ce04910 · ce04910
2 parents 3136960 + 1128ceb
commit ce04910
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/lib/rules/await-interactions.ts b/lib/rules/await-interactions.ts
@@ -141,7 +141,7 @@ export = createStorybookRule({
     return {
       CallExpression(node: CallExpression) {
         const method = getMethodThatShouldBeAwaited(node)
-        if (method && !isAwaitExpression(node.parent)) {
+        if (method && !isAwaitExpression(node.parent) && !isAwaitExpression(node.parent?.parent)) {
           invocationsThatShouldBeAwaited.push({ node, method })
         }
       },

diff --git a/tests/lib/rules/await-interactions.test.ts b/tests/lib/rules/await-interactions.test.ts
@@ -80,6 +80,27 @@ ruleTester.run('await-interactions', rule, {
     // `,
     'Basic.play = async () => userEvent.click(button)',
     'Basic.play = async () => { return userEvent.click(button) }',
+    dedent`
+      export const SecondStory = {
+        play: async (context) => {
+          await FirstStory.play(context)
+        }
+      }
+    `,
+    dedent`
+      export const SecondStory = {
+        play: async (context) => {
+          await FirstStory.play?.(context)
+        }
+      }
+    `,
+    dedent`
+      export const SecondStory = {
+        play: async (context) => {
+          await FirstStory.play!(context)
+        }
+      }
+    `,
   ],
   invalid: [
     {
@@ -292,18 +313,20 @@ ruleTester.run('await-interactions', rule, {
     },
     {
       code: dedent`
-        export const ThirdStory = {
+        export const FourthStory = {
           play: async (context) => {
             FirstStory.play(context)
             SecondStory.play!(context)
+            ThirdStory.play?.(context)
           }
         }
       `,
       output: dedent`
-        export const ThirdStory = {
+        export const FourthStory = {
           play: async (context) => {
             await FirstStory.play(context)
             await SecondStory.play!(context)
+            await ThirdStory.play?.(context)
           }
         }
       `,
@@ -316,6 +339,10 @@ ruleTester.run('await-interactions', rule, {
           messageId: 'interactionShouldBeAwaited',
           data: { method: 'play' },
         },
+        {
+          messageId: 'interactionShouldBeAwaited',
+          data: { method: 'play' },
+        },
       ],
     },
   ],