use callgraph instead of TypeInference in Testing.qll

erik-krogh · erik-krogh · commit b20ce8bfca2c · 2021-03-02T14:04:23.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Testing.qll b/javascript/ql/src/semmle/javascript/frameworks/Testing.qll
@@ -33,7 +33,7 @@ class BDDTest extends Test, @call_expr {
     exists(CallExpr call | call = this |
       call.getCallee().(VarAccess).getName() = "it" and
       exists(call.getArgument(0).getStringValue()) and
-      call.getArgument(1).analyze().getAValue() instanceof AbstractFunction
+      exists(call.getArgument(1).flow().getAFunctionValue(0))
     )
   }
 }
@@ -60,7 +60,7 @@ class JestTest extends Test, @call_expr {
     exists(CallExpr call | call = this |
       call.getCallee().(GlobalVarAccess).getName() = "test" and
       exists(call.getArgument(0).getStringValue()) and
-      call.getArgument(1).analyze().getAValue() instanceof AbstractFunction
+      exists(call.getArgument(1).flow().getAFunctionValue(0))
     ) and
     getFile() = getTestFile(any(File f), "test")
   }
@@ -94,7 +94,7 @@ class CucumberTest extends Test, @call_expr {
     exists(DataFlow::ModuleImportNode m, CallExpr call |
       m.getPath() = "cucumber" and
       call = m.getAnInvocation().asExpr() and
-      call.getArgument(0).analyze().getAValue() instanceof AbstractFunction and
+      exists(call.getArgument(0).flow().getAFunctionValue()) and
       this = call
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class BDDTest extends Test, @call_expr {`
`33`	`33`	`exists(CallExpr call \| call = this \|`
`34`	`34`	`call.getCallee().(VarAccess).getName() = "it" and`
`35`	`35`	`exists(call.getArgument(0).getStringValue()) and`
`36`		`- call.getArgument(1).analyze().getAValue() instanceof AbstractFunction`
	`36`	`+ exists(call.getArgument(1).flow().getAFunctionValue(0))`
`37`	`37`	`)`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -60,7 +60,7 @@ class JestTest extends Test, @call_expr {`
`60`	`60`	`exists(CallExpr call \| call = this \|`
`61`	`61`	`call.getCallee().(GlobalVarAccess).getName() = "test" and`
`62`	`62`	`exists(call.getArgument(0).getStringValue()) and`
`63`		`- call.getArgument(1).analyze().getAValue() instanceof AbstractFunction`
	`63`	`+ exists(call.getArgument(1).flow().getAFunctionValue(0))`
`64`	`64`	`) and`
`65`	`65`	`getFile() = getTestFile(any(File f), "test")`
`66`	`66`	`}`
`@@ -94,7 +94,7 @@ class CucumberTest extends Test, @call_expr {`
`94`	`94`	`exists(DataFlow::ModuleImportNode m, CallExpr call \|`
`95`	`95`	`m.getPath() = "cucumber" and`
`96`	`96`	`call = m.getAnInvocation().asExpr() and`
`97`		`- call.getArgument(0).analyze().getAValue() instanceof AbstractFunction and`
	`97`	`+ exists(call.getArgument(0).flow().getAFunctionValue()) and`
`98`	`98`	`this = call`
`99`	`99`	`)`
`100`	`100`	`}`