Skip to content

Commit d8d4e22

Browse files
[Event Grid] Migrate tests to the new recorder (Azure#20273)
* event grid should be done * remove comments * TestProxy: true
1 parent 43da702 commit d8d4e22

File tree

36 files changed

+887
-647
lines changed

36 files changed

+887
-647
lines changed

sdk/eventgrid/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ extends:
2424
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
2525
parameters:
2626
ServiceDirectory: eventgrid
27+
TestProxy: true
2728
Artifacts:
2829
- name: azure-eventgrid
2930
safeName: azureeventgrid

sdk/eventgrid/eventgrid/karma.conf.js

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33

44
// https://github.com/karma-runner/karma-chrome-launcher
55
process.env.CHROME_BIN = require("puppeteer").executablePath();
6+
const { relativeRecordingsPath } = require("@azure-tools/test-recorder");
67
require("dotenv").config();
7-
const {
8-
jsonRecordingFilterFunction,
9-
isPlaybackMode,
10-
isSoftRecordMode,
11-
isRecordMode,
12-
} = require("@azure-tools/test-recorder");
8+
9+
process.env.RECORDINGS_RELATIVE_PATH = relativeRecordingsPath();
1310

1411
module.exports = function (config) {
1512
config.set({
@@ -31,14 +28,10 @@ module.exports = function (config) {
3128
"karma-coverage",
3229
"karma-sourcemap-loader",
3330
"karma-junit-reporter",
34-
"karma-json-to-file-reporter",
35-
"karma-json-preprocessor",
3631
],
3732

3833
// list of files / patterns to load in the browser
39-
files: ["dist-test/index.browser.js"].concat(
40-
isPlaybackMode() || isSoftRecordMode() ? ["recordings/browsers/**/*.json"] : []
41-
),
34+
files: ["dist-test/index.browser.js"],
4235

4336
// list of files / patterns to exclude
4437
exclude: [],
@@ -47,7 +40,6 @@ module.exports = function (config) {
4740
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
4841
preprocessors: {
4942
"**/*.js": ["sourcemap", "env"],
50-
"recordings/browsers/**/*.json": ["json"],
5143
// IMPORTANT: COMMENT following line if you want to debug in your browsers!!
5244
// Preprocess source file to calculate code coverage, however this will make source file unreadable
5345
// "dist-test/index.browser.js": ["coverage"]
@@ -61,12 +53,13 @@ module.exports = function (config) {
6153
"EVENT_GRID_CUSTOM_SCHEMA_API_KEY",
6254
"EVENT_GRID_CLOUD_EVENT_SCHEMA_ENDPOINT",
6355
"EVENT_GRID_CLOUD_EVENT_SCHEMA_API_KEY",
56+
"RECORDINGS_RELATIVE_PATH",
6457
],
6558

6659
// test results reporter to use
6760
// possible values: 'dots', 'progress'
6861
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
69-
reporters: ["mocha", "coverage", "junit", "json-to-file"],
62+
reporters: ["mocha", "coverage", "junit"],
7063

7164
coverageReporter: {
7265
// specify a common output directory
@@ -89,11 +82,6 @@ module.exports = function (config) {
8982
properties: {}, // key value pair of properties to add to the <properties> section of the report
9083
},
9184

92-
jsonToFileReporter: {
93-
filter: jsonRecordingFilterFunction,
94-
outputPath: ".",
95-
},
96-
9785
// web server port
9886
port: 9876,
9987

@@ -128,9 +116,6 @@ module.exports = function (config) {
128116
browserNoActivityTimeout: 600000,
129117
browserDisconnectTimeout: 10000,
130118
browserDisconnectTolerance: 3,
131-
browserConsoleLogOptions: {
132-
terminal: !isRecordMode(),
133-
},
134119

135120
client: {
136121
mocha: {

sdk/eventgrid/eventgrid/package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,24 @@
7171
"extract-api": "tsc -p . && api-extractor run --local",
7272
"format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
7373
"generate:client": "autorest --typescript ./swagger/README.md && node ./scripts/setPathToEmpty.js",
74-
"integration-test:browser": "karma start --single-run",
75-
"integration-test:node": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 5000000 --full-trace \"dist-esm/test/**/*.spec.js\"",
74+
"integration-test:browser": "dev-tool run test:browser",
75+
"integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 \"dist-esm/test/**/*.spec.js\"",
7676
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
7777
"lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]",
7878
"lint": "eslint package.json api-extractor.json src test --ext .ts",
7979
"pack": "npm pack 2>&1",
8080
"test:browser": "npm run clean && npm run build:test && npm run unit-test:browser",
8181
"test:node": "npm run clean && npm run build:test && npm run unit-test:node",
8282
"test": "npm run clean && npm run build:test && npm run unit-test",
83-
"unit-test:browser": "karma start --single-run",
84-
"unit-test:node": "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace \"test/{,!(browser)/**/}*.spec.ts\"",
83+
"unit-test:browser": "dev-tool run test:browser",
84+
"unit-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/**/*.spec.ts'",
8585
"unit-test": "npm run unit-test:node && npm run unit-test:browser"
8686
},
8787
"sideEffects": false,
8888
"autoPublish": false,
8989
"dependencies": {
9090
"@azure/core-auth": "^1.3.0",
91-
"@azure/core-client": "^1.0.0",
91+
"@azure/core-client": "^1.5.1",
9292
"@azure/core-rest-pipeline": "^1.1.0",
9393
"@azure/core-tracing": "1.0.0-preview.13",
9494
"@azure/logger": "^1.0.0",
@@ -100,7 +100,7 @@
100100
"@azure/eslint-plugin-azure-sdk": "^3.0.0",
101101
"@azure/service-bus": "^7.0.0",
102102
"@azure/test-utils": "^1.0.0",
103-
"@azure-tools/test-recorder": "^1.0.0",
103+
"@azure-tools/test-recorder": "^2.0.0",
104104
"@microsoft/api-extractor": "^7.18.11",
105105
"@types/chai": "^4.1.6",
106106
"@types/chai-as-promised": "^7.1.0",
@@ -120,8 +120,6 @@
120120
"karma-env-preprocessor": "^0.1.1",
121121
"karma-firefox-launcher": "^1.1.0",
122122
"karma-ie-launcher": "^1.0.0",
123-
"karma-json-preprocessor": "^0.3.3",
124-
"karma-json-to-file-reporter": "^1.0.1",
125123
"karma-junit-reporter": "^2.0.1",
126124
"karma-mocha": "^2.0.1",
127125
"karma-mocha-reporter": "^2.2.5",

sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_send_cloudevent_schema/recording_enriches_events_with_distributed_tracing_information.json

Lines changed: 40 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_send_cloudevent_schema/recording_sends_a_single_event.json

Lines changed: 40 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_send_cloudevent_schema/recording_sends_multiple_events.json

Lines changed: 42 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)