JavaScript: Simplify some imports.

Max Schaefer · Max Schaefer · commit 8e340922cb83 · 2019-03-01T14:44:58.000Z
diff --git a/javascript/ql/test/library-tests/frameworks/Express/ExpressSession.qll b/javascript/ql/test/library-tests/frameworks/Express/ExpressSession.qll
@@ -1,5 +1,4 @@
 import javascript
-import semmle.javascript.frameworks.ExpressModules
 
 query predicate test_ExpressSession(
   ExpressLibraries::ExpressSession::MiddlewareInstance session, string name, DataFlow::Node res
diff --git a/javascript/ql/test/library-tests/frameworks/Express/RouteHandler_getARequestExpr.qll b/javascript/ql/test/library-tests/frameworks/Express/RouteHandler_getARequestExpr.qll
@@ -1,4 +1,4 @@
-import semmle.javascript.frameworks.Express
+import javascript
 
 query predicate test_RouteHandler_getARequestExpr(Express::RouteHandler rh, HTTP::RequestExpr res) {
   res = rh.getARequestExpr()
diff --git a/javascript/ql/test/library-tests/frameworks/Express/RouteHandler_getAResponseExpr.qll b/javascript/ql/test/library-tests/frameworks/Express/RouteHandler_getAResponseExpr.qll
@@ -1,4 +1,4 @@
-import semmle.javascript.frameworks.Express
+import javascript
 
 query predicate test_RouteHandler_getAResponseExpr(Express::RouteHandler rh, HTTP::ResponseExpr res) {
   res = rh.getAResponseExpr()
diff --git a/javascript/ql/test/library-tests/frameworks/Express/isRequest.qll b/javascript/ql/test/library-tests/frameworks/Express/isRequest.qll
@@ -1,3 +1,3 @@
-import semmle.javascript.frameworks.Express
+import javascript
 
 query predicate test_isRequest(Expr nd) { Express::isRequest(nd) }
diff --git a/javascript/ql/test/library-tests/frameworks/Express/isResponse.qll b/javascript/ql/test/library-tests/frameworks/Express/isResponse.qll
@@ -1,3 +1,3 @@
-import semmle.javascript.frameworks.Express
+import javascript
 
 query predicate test_isResponse(Expr nd) { Express::isResponse(nd) }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import javascript`
`2`		`-import semmle.javascript.frameworks.ExpressModules`
`3`	`2`
`4`	`3`	`query predicate test_ExpressSession(`
`5`	`4`	`ExpressLibraries::ExpressSession::MiddlewareInstance session, string name, DataFlow::Node res`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import semmle.javascript.frameworks.Express`
	`1`	`+import javascript`
`2`	`2`
`3`	`3`	`query predicate test_RouteHandler_getARequestExpr(Express::RouteHandler rh, HTTP::RequestExpr res) {`
`4`	`4`	`res = rh.getARequestExpr()`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-import semmle.javascript.frameworks.Express`
	`1`	`+import javascript`
`2`	`2`
`3`	`3`	`query predicate test_isRequest(Expr nd) { Express::isRequest(nd) }`