Remove codeql CLI-based testing, fix editorconfig issues

agius · agius · commit 26ad66679303 · 2020-09-04T13:36:56.000-04:00
diff --git a/.codeqlmanifest.json b/.codeqlmanifest.json
@@ -1,10 +1,9 @@
-{ 
-  "provide": [ 
+{
+  "provide": [
     "ql/src/qlpack.yml",
-    "ql/test/qlpack.yml",
-    "extractor/codeql-extractor.yml" 
+    "extractor/codeql-extractor.yml"
   ],
-  "ignore": [ 
-    "the-extractor-which-needs-to-be-built" 
-  ] 
+  "ignore": [
+    "the-extractor-which-needs-to-be-built"
+  ]
 }
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -86,13 +86,6 @@ jobs:
         working-directory: ./codeql-ruby
         run: |
           bundle exec rake spec:ci
-      
-      - name: Run CodeQL Tests
-        env:
-          CODEQL_PATH: "$GITHUB_WORKSPACE/codeql/codeql"
-        working-directory: ./codeql-ruby
-        run: |
-          codeql test run ql/test
 
       # - name: Setup tmate session
       #   uses: mxschmitt/action-tmate@v2
diff --git a/extractor/codeql-extractor.yml b/extractor/codeql-extractor.yml
@@ -8,4 +8,4 @@ file_types:
     display_name: Ruby
     extensions:
       - .rb
-legacy_qltest_extraction: true
+legacy_qltest_extraction: false
diff --git a/extractor/tools/index.sh b/extractor/tools/index.sh
diff --git a/ql/src/Files.qll b/ql/src/Files.qll
@@ -1,9 +1,9 @@
-/** 
- * Provides classes for working with files and folders. 
- * 
+/**
+ * Provides classes for working with files and folders.
+ *
  * Stolen liberally from the Javascript QLL
  * https://github.com/github/codeql/blob/813d14791d6bea399bc96fa9b7143603eef6e6c4/javascript/ql/src/semmle/javascript/Files.qll
- * 
+ *
  */
 
 import ruby
@@ -200,4 +200,4 @@ class File extends Container, @file {
 
   /** Gets the URL of this file. */
   override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
-}
+}
diff --git a/ql/src/Locations.qll b/ql/src/Locations.qll
@@ -1,9 +1,9 @@
-/** 
- * Provides classes for working with locations and program elements that have locations. 
- * 
+/**
+ * Provides classes for working with locations and program elements that have locations.
+ *
  * Stolen liberally from the Javascript QL library:
  * https://github.com/github/codeql/blob/813d14791d6bea399bc96fa9b7143603eef6e6c4/javascript/ql/src/semmle/javascript/Locations.qll
- * 
+ *
  */
 
 import ruby
@@ -107,4 +107,4 @@ class Locatable extends @locatable {
     // to be overridden by subclasses
     none()
   }
-}
+}
diff --git a/ql/src/ruby.qll b/ql/src/ruby.qll
@@ -1,4 +1,4 @@
 
 import Files
 import Locations
-import LeafNode
+import LeafNode
diff --git a/ql/test/leaf_node_location/leaf_node_location.expected b/ql/test/leaf_node_location/leaf_node_location.expected
diff --git a/ql/test/leaf_node_location/leaf_node_location.ql b/ql/test/leaf_node_location/leaf_node_location.ql
diff --git a/ql/test/leaf_node_location/leaf_node_location.rb b/ql/test/leaf_node_location/leaf_node_location.rb
diff --git a/spec/codeql_ruby_spec.rb b/spec/codeql_ruby_spec.rb
@@ -26,4 +26,11 @@
 
     expect(results).to be_a(String)
   end
+
+  it "extracts Location info from LeafNodes" do
+    results = CodeqlRunner.results_for_db('leaf_node_location')
+    tuples = results.dig('#select', 'tuples')
+
+    expect(tuples).to include([{'label'=>'LeafNode'}, 'puts', 'leaf_node_location.rb:1'])
+  end
 end
diff --git a/spec/leaf_node_location/example.ql b/spec/leaf_node_location/example.ql
@@ -0,0 +1,4 @@
+import ruby
+
+from LeafNode n
+select n, n.getText(), n.getLocation().toString()
diff --git a/spec/leaf_node_location/leaf_node_location.rb b/spec/leaf_node_location/leaf_node_location.rb
@@ -0,0 +1 @@
+puts 'this file contains some leaf nodes'
diff --git a/spec/leaf_node_location/qlpack.yml b/spec/leaf_node_location/qlpack.yml
@@ -1,4 +1,3 @@
-name: codeql-ruby-tests
+name: leaf-node-location-ruby-queries
 version: 0.0.0
 libraryPathDependencies: codeql-ruby
-extractor: ruby
