Skip to content

Commit 4cef2ec

Browse files
AnemyAnemy
authored
chore: use package json version for tests (#649)
1 parent ad25872 commit 4cef2ec

File tree

3 files changed

+42
-39
lines changed

3 files changed

+42
-39
lines changed

‎src/test/suite/connectionController.test.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ import {
3232
} from './dbTestHelper';
3333
import type { LoadedConnection } from '../../storage/connectionStorage';
3434

35+
// eslint-disable-next-line @typescript-eslint/no-var-requires
36+
const { version } = require('../../../package.json');
37+
3538
const testDatabaseConnectionName = 'localhost:27088';
3639
const testDatabaseURI2WithTimeout =
3740
'mongodb://shouldfail?connectTimeoutMS=1000&serverSelectionTimeoutMS=1000';
@@ -245,8 +248,7 @@ suite('Connection Controller Test Suite', function () {
245248
});
246249

247250
test('the connection model loads both global and workspace stored connection models', async () => {
248-
const expectedDriverUrl =
249-
'mongodb://localhost:27088/?appname=mongodb-vscode+0.0.0-dev.0';
251+
const expectedDriverUrl = `mongodb://localhost:27088/?appname=mongodb-vscode+${version}`;
250252

251253
await vscode.workspace
252254
.getConfiguration('mdb.connectionSaving')
@@ -850,7 +852,7 @@ suite('Connection Controller Test Suite', function () {
850852
);
851853
assert.strictEqual(
852854
connections[0].connectionOptions?.connectionString.includes(
853-
'appname=mongodb-vscode+0.0.0-dev.0'
855+
`appname=mongodb-vscode+${version}`
854856
),
855857
true
856858
);
@@ -894,8 +896,7 @@ suite('Connection Controller Test Suite', function () {
894896
assert.deepStrictEqual(connectionInfo, {
895897
id: 'c4871b21-92c4-40e2-a2c2-fdd551cff114',
896898
connectionOptions: {
897-
connectionString:
898-
'mongodb+srv://username:[email protected]/?authSource=admin&readPreference=primary&appname=mongodb-vscode+0.0.0-dev.0&ssl=true',
899+
connectionString: `mongodb+srv://username:[email protected]/?authSource=admin&readPreference=primary&appname=mongodb-vscode+${version}&ssl=true`,
899900
},
900901
});
901902
});
@@ -914,7 +915,7 @@ suite('Connection Controller Test Suite', function () {
914915
delete mongoClientConnectionOptions.options.oidc?.openBrowser;
915916

916917
assert.deepStrictEqual(mongoClientConnectionOptions, {
917-
url: 'mongodb://localhost:27088/?appname=mongodb-vscode+0.0.0-dev.0',
918+
url: `mongodb://localhost:27088/?appname=mongodb-vscode+${version}`,
918919
options: {
919920
autoEncryption: undefined,
920921
monitorCommands: true,
@@ -929,11 +930,10 @@ suite('Connection Controller Test Suite', function () {
929930
});
930931

931932
test('_getConnectionStringWithProxy returns string with proxy options', () => {
932-
const expectedConnectionStringWithProxy =
933-
'mongodb://localhost:27088/?appname=mongodb-vscode+0.0.0-dev.0&proxyHost=localhost&proxyPassword=gwce7tr8733ujbr&proxyPort=3378&proxyUsername=test';
933+
const expectedConnectionStringWithProxy = `mongodb://localhost:27088/?appname=mongodb-vscode+${version}&proxyHost=localhost&proxyPassword=gwce7tr8733ujbr&proxyPort=3378&proxyUsername=test`;
934934
const connectionString =
935935
testConnectionController._getConnectionStringWithProxy({
936-
url: 'mongodb://localhost:27088/?appname=mongodb-vscode+0.0.0-dev.0',
936+
url: `mongodb://localhost:27088/?appname=mongodb-vscode+${version}`,
937937
options: {
938938
proxyHost: 'localhost',
939939
proxyPassword: 'gwce7tr8733ujbr',

‎src/test/suite/editors/playgroundSelectedCodeActionProvider.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ import { ExportToLanguageMode } from '../../../types/playgroundType';
1414
import { TEST_DATABASE_URI } from '../dbTestHelper';
1515
import { ExtensionContextStub } from '../stubs';
1616

17+
// eslint-disable-next-line @typescript-eslint/no-var-requires
18+
const { version } = require('../../../../package.json');
19+
1720
const expect = chai.expect;
1821

1922
suite('Playground Selected CodeAction Provider Test Suite', function () {
@@ -385,8 +388,7 @@ suite('Playground Selected CodeAction Provider Test Suite', function () {
385388
expectedResult = {
386389
namespace: 'db.coll',
387390
type: null,
388-
content:
389-
"# Requires the PyMongo package.\n# https://api.mongodb.com/python/current\n\nclient = MongoClient('mongodb://localhost:27088/?appname=mongodb-vscode+0.0.0-dev.0')\nfilter={\n 'name': '22'\n}\n\nresult = client['db']['coll'].find(\n filter=filter\n)",
391+
content: `# Requires the PyMongo package.\n# https://api.mongodb.com/python/current\n\nclient = MongoClient('mongodb://localhost:27088/?appname=mongodb-vscode+${version}')\nfilter={\n 'name': '22'\n}\n\nresult = client['db']['coll'].find(\n filter=filter\n)`,
390392
language: 'python',
391393
};
392394

@@ -460,8 +462,7 @@ suite('Playground Selected CodeAction Provider Test Suite', function () {
460462
expectedResult = {
461463
namespace: 'db.coll',
462464
type: null,
463-
content:
464-
"# Requires the MongoDB Ruby Driver\n# https://docs.mongodb.com/ruby-driver/master/\n\nclient = Mongo::Client.new('mongodb://localhost:27088/?appname=mongodb-vscode+0.0.0-dev.0', :database => 'db')\n\nresult = client.database['coll'].find({\n 'name' => '22'\n})",
465+
content: `# Requires the MongoDB Ruby Driver\n# https://docs.mongodb.com/ruby-driver/master/\n\nclient = Mongo::Client.new('mongodb://localhost:27088/?appname=mongodb-vscode+${version}', :database => 'db')\n\nresult = client.database['coll'].find({\n 'name' => '22'\n})`,
465466
language: 'ruby',
466467
};
467468

@@ -535,8 +536,7 @@ suite('Playground Selected CodeAction Provider Test Suite', function () {
535536
expectedResult = {
536537
namespace: 'db.coll',
537538
type: null,
538-
content:
539-
'// Requires the MongoDB Go Driver\n// https://go.mongodb.org/mongo-driver\nctx := context.TODO()\n\n// Set client options\nclientOptions := options.Client().ApplyURI("mongodb://localhost:27088/?appname=mongodb-vscode+0.0.0-dev.0")\n\n// Connect to MongoDB\nclient, err := mongo.Connect(ctx, clientOptions)\nif err != nil {\n log.Fatal(err)\n}\ndefer func() {\n if err := client.Disconnect(ctx); err != nil {\n log.Fatal(err)\n }\n}()\n\n// Find data\ncoll := client.Database("db").Collection("coll")\n_, err = coll.Find(ctx, bson.D{{"name", "22"}})\nif err != nil {\n log.Fatal(err)\n}',
539+
content: `// Requires the MongoDB Go Driver\n// https://go.mongodb.org/mongo-driver\nctx := context.TODO()\n\n// Set client options\nclientOptions := options.Client().ApplyURI("mongodb://localhost:27088/?appname=mongodb-vscode+${version}")\n\n// Connect to MongoDB\nclient, err := mongo.Connect(ctx, clientOptions)\nif err != nil {\n log.Fatal(err)\n}\ndefer func() {\n if err := client.Disconnect(ctx); err != nil {\n log.Fatal(err)\n }\n}()\n\n// Find data\ncoll := client.Database("db").Collection("coll")\n_, err = coll.Find(ctx, bson.D{{"name", "22"}})\nif err != nil {\n log.Fatal(err)\n}`,
540540
language: 'go',
541541
};
542542

‎src/test/suite/telemetry/telemetryService.test.ts‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ import { mdbTestExtension } from '../stubbableMdbExtension';
1515
import { DatabaseTreeItem, DocumentTreeItem } from '../../../explorer';
1616
import { DataServiceStub } from '../stubs';
1717

18+
// eslint-disable-next-line @typescript-eslint/no-var-requires
19+
const { version } = require('../../../../package.json');
20+
1821
const expect = chai.expect;
1922

2023
chai.use(sinonChai);
@@ -129,7 +132,7 @@ suite('Telemetry Controller Test Suite', () => {
129132
event: 'Command Run',
130133
properties: {
131134
command: 'mdb.addConnection',
132-
extension_version: '0.0.0-dev.0',
135+
extension_version: version,
133136
},
134137
})
135138
);
@@ -149,8 +152,8 @@ suite('Telemetry Controller Test Suite', () => {
149152
is_used_connect_screen: false,
150153
is_used_command_palette: true,
151154
is_used_saved_connection: false,
152-
vscode_mdb_extension_version: '0.0.0-dev.0',
153-
extension_version: '0.0.0-dev.0',
155+
vscode_mdb_extension_version: version,
156+
extension_version: version,
154157
},
155158
})
156159
);
@@ -170,8 +173,8 @@ suite('Telemetry Controller Test Suite', () => {
170173
is_used_connect_screen: true,
171174
is_used_command_palette: false,
172175
is_used_saved_connection: false,
173-
vscode_mdb_extension_version: '0.0.0-dev.0',
174-
extension_version: '0.0.0-dev.0',
176+
vscode_mdb_extension_version: version,
177+
extension_version: version,
175178
},
176179
})
177180
);
@@ -191,8 +194,8 @@ suite('Telemetry Controller Test Suite', () => {
191194
is_used_connect_screen: false,
192195
is_used_command_palette: false,
193196
is_used_saved_connection: true,
194-
vscode_mdb_extension_version: '0.0.0-dev.0',
195-
extension_version: '0.0.0-dev.0',
197+
vscode_mdb_extension_version: version,
198+
extension_version: version,
196199
},
197200
})
198201
);
@@ -209,7 +212,7 @@ suite('Telemetry Controller Test Suite', () => {
209212
properties: {
210213
source: 'treeview',
211214
success: true,
212-
extension_version: '0.0.0-dev.0',
215+
extension_version: version,
213216
},
214217
})
215218
);
@@ -223,7 +226,7 @@ suite('Telemetry Controller Test Suite', () => {
223226
sinon.match({
224227
anonymousId,
225228
event: 'Document Edited',
226-
properties: { source: 'playground', extension_version: '0.0.0-dev.0' },
229+
properties: { source: 'playground', extension_version: version },
227230
})
228231
);
229232
});
@@ -241,7 +244,7 @@ suite('Telemetry Controller Test Suite', () => {
241244
type: 'other',
242245
partial: false,
243246
error: false,
244-
extension_version: '0.0.0-dev.0',
247+
extension_version: version,
245248
},
246249
})
247250
);
@@ -261,7 +264,7 @@ suite('Telemetry Controller Test Suite', () => {
261264
event: 'Playground Loaded',
262265
properties: {
263266
file_type: 'mongodb',
264-
extension_version: '0.0.0-dev.0',
267+
extension_version: version,
265268
},
266269
})
267270
);
@@ -280,7 +283,7 @@ suite('Telemetry Controller Test Suite', () => {
280283
event: 'Playground Loaded',
281284
properties: {
282285
file_type: 'mongodbjs',
283-
extension_version: '0.0.0-dev.0',
286+
extension_version: version,
284287
},
285288
})
286289
);
@@ -295,7 +298,7 @@ suite('Telemetry Controller Test Suite', () => {
295298
event: 'Playground Saved',
296299
properties: {
297300
file_type: 'mongodbjs',
298-
extension_version: '0.0.0-dev.0',
301+
extension_version: version,
299302
},
300303
})
301304
);
@@ -311,7 +314,7 @@ suite('Telemetry Controller Test Suite', () => {
311314
properties: {
312315
screen: 'helpPanel',
313316
link_id: 'linkId',
314-
extension_version: '0.0.0-dev.0',
317+
extension_version: version,
315318
},
316319
})
317320
);
@@ -335,7 +338,7 @@ suite('Telemetry Controller Test Suite', () => {
335338
with_import_statements: false,
336339
with_builders: false,
337340
with_driver_syntax: false,
338-
extension_version: '0.0.0-dev.0',
341+
extension_version: version,
339342
},
340343
})
341344
);
@@ -361,7 +364,7 @@ suite('Telemetry Controller Test Suite', () => {
361364
with_import_statements: false,
362365
with_builders: false,
363366
with_driver_syntax: false,
364-
extension_version: '0.0.0-dev.0',
367+
extension_version: version,
365368
},
366369
})
367370
);
@@ -551,7 +554,7 @@ suite('Telemetry Controller Test Suite', () => {
551554
event: 'Playground Created',
552555
properties: {
553556
playground_type: 'search',
554-
extension_version: '0.0.0-dev.0',
557+
extension_version: version,
555558
},
556559
})
557560
);
@@ -576,7 +579,7 @@ suite('Telemetry Controller Test Suite', () => {
576579
event: 'Playground Created',
577580
properties: {
578581
playground_type: 'createCollection',
579-
extension_version: '0.0.0-dev.0',
582+
extension_version: version,
580583
},
581584
})
582585
);
@@ -593,7 +596,7 @@ suite('Telemetry Controller Test Suite', () => {
593596
event: 'Playground Created',
594597
properties: {
595598
playground_type: 'createDatabase',
596-
extension_version: '0.0.0-dev.0',
599+
extension_version: version,
597600
},
598601
})
599602
);
@@ -611,7 +614,7 @@ suite('Telemetry Controller Test Suite', () => {
611614
event: 'Playground Created',
612615
properties: {
613616
playground_type: 'index',
614-
extension_version: '0.0.0-dev.0',
617+
extension_version: version,
615618
},
616619
})
617620
);
@@ -648,7 +651,7 @@ suite('Telemetry Controller Test Suite', () => {
648651
event: 'Playground Created',
649652
properties: {
650653
playground_type: 'cloneDocument',
651-
extension_version: '0.0.0-dev.0',
654+
extension_version: version,
652655
},
653656
})
654657
);
@@ -663,7 +666,7 @@ suite('Telemetry Controller Test Suite', () => {
663666
event: 'Playground Created',
664667
properties: {
665668
playground_type: 'crud',
666-
extension_version: '0.0.0-dev.0',
669+
extension_version: version,
667670
},
668671
})
669672
);
@@ -680,7 +683,7 @@ suite('Telemetry Controller Test Suite', () => {
680683
event: 'Playground Created',
681684
properties: {
682685
playground_type: 'crud',
683-
extension_version: '0.0.0-dev.0',
686+
extension_version: version,
684687
},
685688
})
686689
);
@@ -697,7 +700,7 @@ suite('Telemetry Controller Test Suite', () => {
697700
event: 'Playground Created',
698701
properties: {
699702
playground_type: 'crud',
700-
extension_version: '0.0.0-dev.0',
703+
extension_version: version,
701704
},
702705
})
703706
);

0 commit comments

Comments
 (0)