Fix Sinatra test to properly output pathgraph

Author: hvitved

ruby/ql/test/library-tests/frameworks/sinatra/Flow.expected

@@ -7,14 +7,25 @@ edges
 | app.rb:76:25:76:36 | call to [] [element :foo] | views/index.erb:2:10:2:12 | call to foo | provenance |  |
 | app.rb:76:32:76:35 | @foo | app.rb:76:25:76:36 | call to [] [element :foo] | provenance |  |
 | app.rb:76:32:76:35 | self [@foo] | app.rb:76:32:76:35 | @foo | provenance |  |
+| app.rb:95:10:95:14 | self [@user] | app.rb:95:10:95:14 | @user | provenance |  |
+| app.rb:102:10:104:5 | [post] do ... end [captured self, @user] | app.rb:95:10:95:14 | self [@user] | provenance |  |
+| app.rb:103:5:103:9 | [post] self [@user] | app.rb:102:10:104:5 | [post] do ... end [captured self, @user] | provenance |  |
+| app.rb:103:5:103:9 | [post] self [@user] | app.rb:102:10:104:5 | [post] do ... end [captured self, @user] | provenance | heuristic-callback |
+| app.rb:103:13:103:22 | call to source | app.rb:103:5:103:9 | [post] self [@user] | provenance |  |
 nodes
 | app.rb:75:5:75:8 | [post] self [@foo] | semmle.label | [post] self [@foo] |
 | app.rb:75:12:75:17 | call to params | semmle.label | call to params |
 | app.rb:75:12:75:24 | ...[...] | semmle.label | ...[...] |
 | app.rb:76:25:76:36 | call to [] [element :foo] | semmle.label | call to [] [element :foo] |
 | app.rb:76:32:76:35 | @foo | semmle.label | @foo |
 | app.rb:76:32:76:35 | self [@foo] | semmle.label | self [@foo] |
+| app.rb:95:10:95:14 | @user | semmle.label | @user |
+| app.rb:95:10:95:14 | self [@user] | semmle.label | self [@user] |
+| app.rb:102:10:104:5 | [post] do ... end [captured self, @user] | semmle.label | [post] do ... end [captured self, @user] |
+| app.rb:103:5:103:9 | [post] self [@user] | semmle.label | [post] self [@user] |
+| app.rb:103:13:103:22 | call to source | semmle.label | call to source |
 | views/index.erb:2:10:2:12 | call to foo | semmle.label | call to foo |
 subpaths
 #select
+| app.rb:95:10:95:14 | @user | app.rb:103:13:103:22 | call to source | app.rb:95:10:95:14 | @user | $@ | app.rb:103:13:103:22 | call to source | call to source |
 | views/index.erb:2:10:2:12 | call to foo | app.rb:75:12:75:17 | call to params | views/index.erb:2:10:2:12 | call to foo | $@ | app.rb:75:12:75:17 | call to params | call to params |

ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql

@@ -4,7 +4,7 @@
 
 import ruby
 import TestUtilities.InlineFlowTest
-import TaintFlow::PathGraph
+import PathGraph
 import codeql.ruby.frameworks.Sinatra
 import codeql.ruby.Concepts
 
@@ -18,6 +18,6 @@ module SinatraConfig implements DataFlow::ConfigSig {
 
 import FlowTest<DefaultFlowConfig, SinatraConfig>
 
-from TaintFlow::PathNode source, TaintFlow::PathNode sink
-where TaintFlow::flowPath(source, sink)
+from PathNode source, PathNode sink
+where flowPath(source, sink)
 select sink, source, sink, "$@", source, source.toString()