feat: Add handling for when the wait method is given an Identifier wh…

…ich has a number value
cypress-io · Dec 13, 2019 · e66bdfd · e66bdfd
2 parents 9086352 + 0ef8935
commit e66bdfd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/rules/no-unnecessary-waiting.js b/lib/rules/no-unnecessary-waiting.js
@@ -21,8 +21,12 @@ module.exports = {
   create (context) {
     return {
       CallExpression (node) {
-        if (isCallingCyWait(node) && isNumberArgument(node)) {
-          context.report({ node, messageId: 'unexpected' })
+        if (isCallingCyWait(node)) {
+          const scope = context.getScope()
+
+          if (isIdentifierNumberConstArgument(node, scope) || isNumberArgument(node)) {
+            context.report({ node, messageId: 'unexpected' })
+          }
         }
       },
     }
@@ -42,3 +46,14 @@ function isNumberArgument (node) {
          node.arguments[0].type === 'Literal' &&
          typeof (node.arguments[0].value) === 'number'
 }
+
+function isIdentifierNumberConstArgument (node, scope) {
+  if (node.arguments[0].type !== 'Identifier') {
+    return false
+  }
+
+  const resolvedIdentifier = scope.resolve(node.arguments[0]).resolved
+  const IdentifierValue = resolvedIdentifier.defs[0].node.init.value
+
+  return typeof IdentifierValue === 'number'
+}
diff --git a/tests/lib/rules/no-unnecessary-waiting.js b/tests/lib/rules/no-unnecessary-waiting.js
@@ -18,11 +18,14 @@ ruleTester.run('no-unnecessary-waiting', rule, {
     { code: 'cy.clock(5000)', parserOptions },
     { code: 'cy.scrollTo(0, 10)', parserOptions },
     { code: 'cy.tick(500)', parserOptions },
+
+    { code: 'const someRequest="@someRequest"; cy.wait(someRequest)', parserOptions, errors },
   ],
 
   invalid: [
     { code: 'cy.wait(0)', parserOptions, errors },
     { code: 'cy.wait(100)', parserOptions, errors },
     { code: 'cy.wait(5000)', parserOptions, errors },
+    { code: 'const someNumber=500; cy.wait(someNumber)', parserOptions, errors },
   ],
 })