Skip to content

Commit 034006f

Browse files
aeisenbergaofaof0907
authored andcommitted
Update integration test version numbers
Also, fix a typo and remove comment.
1 parent 6753525 commit 034006f

4 files changed

Lines changed: 6 additions & 12 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
strategy:
122122
matrix:
123123
os: [ubuntu-latest, windows-latest]
124-
version: ['v2.3.1', 'v2.3.0']
124+
version: ['v2.2.6', 'v2.3.3', 'v2.4.0']
125125
env:
126126
CLI_VERSION: ${{ matrix.version }}
127127

extensions/ql-vscode/src/query-history.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ interface QueryHistoryDataProvider extends vscode.TreeDataProvider<CompletedQuer
6161
* Tree data provider for the query history view.
6262
*/
6363
class HistoryTreeDataProvider extends DisposableObject implements QueryHistoryDataProvider {
64-
/**
65-
* XXX: This idiom for how to get a `.fire()`-able event emitter was
66-
* cargo culted from another vscode extension. It seems rather
67-
* involved and I hope there's something better that can be done
68-
* instead.
69-
*/
7064
private _onDidChangeTreeData = super.push(new vscode.EventEmitter<CompletedQuery | undefined>());
7165

7266
readonly onDidChangeTreeData: vscode.Event<CompletedQuery | undefined> = this

extensions/ql-vscode/src/vscode-tests/ensureCli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const _10MB = _1MB * 10;
3535

3636
// CLI version to test. Hard code the latest as default. And be sure
3737
// to update the env if it is not otherwise set.
38-
const CLI_VERSION = process.env.CLI_VERSION || 'v2.3.1';
38+
const CLI_VERSION = process.env.CLI_VERSION || 'v2.4.0';
3939
process.env.CLI_VERSION = CLI_VERSION;
4040

4141
// Base dir where CLIs will be downloaded into

extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const VSCODE_VERSION = 'stable';
2828
// - minimal-workspace - Tests with a simple workspace selected upon launch.
2929
// - cli-integration - Tests that require a cli to invoke actual commands
3030
enum TestDir {
31-
NoWorskspace = 'no-workspace',
32-
MinimalWorskspace = 'minimal-workspace',
31+
NoWorksspace = 'no-workspace',
32+
MinimalWorksspace = 'minimal-workspace',
3333
CliIntegration = 'cli-integration'
3434
}
3535

@@ -108,12 +108,12 @@ main();
108108

109109
function getLaunchArgs(dir: TestDir) {
110110
switch (dir) {
111-
case TestDir.NoWorskspace:
111+
case TestDir.NoWorksspace:
112112
return [
113113
'--disable-extensions'
114114
];
115115

116-
case TestDir.MinimalWorskspace:
116+
case TestDir.MinimalWorksspace:
117117
return [
118118
'--disable-extensions',
119119
path.resolve(__dirname, '../../test/data')

0 commit comments

Comments
 (0)