Merge branch 'main' of github.com:tjgurwara99/vscode-codeql

Author: tjgurwara99

…ensions/ql-vscode/.git-blame-ignore-revs .git-blame-ignore-revsextensions/ql-vscode/.git-blame-ignore-revs renamed to .git-blame-ignore-revs extensions/ql-vscode/.git-blame-ignore-revs renamed to .git-blame-ignore-revs

@@ -11,7 +11,7 @@ updates:
       - dependency-name: "*"
         update-types: ["version-update:semver-minor", "version-update:semver-patch"]
   - package-ecosystem: "github-actions"
-    directory: ".github"
+    directory: "/"
     schedule:
       interval: "weekly"
       day: "thursday" # Thursday is arbitrary

.github/dependabot.yml

@@ -13,4 +13,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v3
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v1
+        uses: actions/dependency-review-action@v3

.github/workflows/dependency-review.yml

@@ -116,7 +116,7 @@ jobs:
           perl -i -pe 's/^/## \[UNRELEASED\]\n\n/ if($.==3)' CHANGELOG.md
 
       - name: Create version bump PR
-        uses: peter-evans/create-pull-request@c7f493a8000b8aeb17a1332e326ba76b57cb83eb # v3.4.1
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
         if: success()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -38,7 +38,7 @@
       },
       "args": [
         "--projects",
-        "test"
+        "test/unit-tests"
       ],
       "stopOnEntry": false,
       "sourceMaps": true,
@@ -94,7 +94,7 @@
       "cwd": "${workspaceFolder}/extensions/ql-vscode",
       "args": [
         "--projects",
-        "src/vscode-tests/no-workspace"
+        "test/vscode-tests/no-workspace"
       ],
       "sourceMaps": true,
       "console": "integratedTerminal",
@@ -110,7 +110,7 @@
       "cwd": "${workspaceFolder}/extensions/ql-vscode",
       "args": [
         "--projects",
-        "src/vscode-tests/minimal-workspace"
+        "test/vscode-tests/minimal-workspace"
       ],
       "sourceMaps": true,
       "console": "integratedTerminal",
@@ -126,7 +126,7 @@
       "cwd": "${workspaceFolder}/extensions/ql-vscode",
       "args": [
         "--projects",
-        "src/vscode-tests/cli-integration"
+        "test/vscode-tests/cli-integration"
       ],
       "env": {
         // Optionally, set the version to use for the integration tests.

.vscode/launch.json

@@ -95,14 +95,17 @@ More information about Storybook can be found inside the **Overview** page once
 
 We have several types of tests:
 
-* Unit tests: these live in the `tests/pure-tests/` directory
+* Unit tests: these live in the `tests/unit-tests/` directory
 * View tests: these live in `src/view/variant-analysis/__tests__/`
-* VSCode integration tests: these live in `src/vscode-tests/no-workspace` and `src/vscode-tests/minimal-workspace`
-* CLI integration tests: these live in `src/vscode-tests/cli-integration`
+* VSCode integration tests:
+  * `test/vscode-tests/no-workspace` tests: These are intended to cover functionality that is meant to work before you even have a workspace open. 
+  * `test/vscode-tests/minimal-workspace` tests: These are intended to cover functionality that need a workspace but don't require the full extension to be activated.
+* CLI integration tests: these live in `test/vscode-tests/cli-integration`
+  * These tests are intendended to be cover functionality that is related to the integration between the CodeQL CLI and the extension.
 
 The CLI integration tests require an instance of the CodeQL CLI to run so they will require some extra setup steps. When adding new tests to our test suite, please be mindful of whether they need to be in the cli-integration folder. If the tests don't depend on the CLI, they are better suited to being a VSCode integration test.
 
-Any test data you're using (sample projects, config files, etc.) must go in a `src/vscode-tests/*/data` directory. When you run the tests, the test runner will copy the data directory to `out/vscode-tests/*/data`.
+Any test data you're using (sample projects, config files, etc.) must go in a `test/vscode-tests/*/data` directory. When you run the tests, the test runner will copy the data directory to `out/vscode-tests/*/data`.
 
 #### Running the tests
 
@@ -155,16 +158,16 @@ The CLI integration tests require the CodeQL standard libraries in order to run
 ##### 1. From the terminal
 
 The easiest way to run a single test is to change the `it` of the test to `it.only` and then run the test command with some additional options
-to only run tests for this specific file. For example, to run the test `src/vscode-tests/cli-integration/run-queries.test.ts`:
+to only run tests for this specific file. For example, to run the test `test/vscode-tests/cli-integration/run-queries.test.ts`:
 
 ```shell
-npm run cli-integration -- --runTestsByPath src/vscode-tests/cli-integration/run-queries.test.ts
+npm run cli-integration -- --runTestsByPath test/vscode-tests/cli-integration/run-queries.test.ts
 ```
 
-You can also use the `--testNamePattern` option to run a specific test within a file. For example, to run the test `src/vscode-tests/cli-integration/run-queries.test.ts`:
+You can also use the `--testNamePattern` option to run a specific test within a file. For example, to run the test `test/vscode-tests/cli-integration/run-queries.test.ts`:
 
 ```shell
-npm run cli-integration -- --runTestsByPath src/vscode-tests/cli-integration/run-queries.test.ts --testNamePattern "should create a QueryEvaluationInfo"
+npm run cli-integration -- --runTestsByPath test/vscode-tests/cli-integration/run-queries.test.ts --testNamePattern "should create a QueryEvaluationInfo"
 ```
 
 ##### 2. From VSCode
@@ -221,6 +224,7 @@ Pre-recorded scenarios are stored in `./src/mocks/scenarios`. However, it's poss
 
 ## Releasing (write access required)
 
+1. Go through [our test plan](/extensions/ql-vscode/docs/test-plan.md) to ensure that the extension is working as expected.
 1. Double-check the `CHANGELOG.md` contains all desired change comments and has the version to be released with date at the top.
     * Go through all recent PRs and make sure they are properly accounted for.
     * Make sure all changelog entries have links back to their PR(s) if appropriate.

CONTRIBUTING.md

@@ -3,7 +3,7 @@ module.exports = {
   parserOptions: {
     ecmaVersion: 2018,
     sourceType: "module",
-    project: ["tsconfig.json", "./src/**/tsconfig.json", "./gulpfile.ts/tsconfig.json", "./scripts/tsconfig.json", "./.storybook/tsconfig.json"],
+    project: ["tsconfig.json", "./src/**/tsconfig.json", "./test/**/tsconfig.json", "./gulpfile.ts/tsconfig.json", "./scripts/tsconfig.json", "./.storybook/tsconfig.json"],
   },
   plugins: [
     "github",

extensions/ql-vscode/.eslintrc.js

@@ -14,3 +14,4 @@ gulpfile.js/**
 tsconfig.json
 .prettierrc
 vsc-extension-quickstart.md
+node_modules/**