From c80ce7705ce4895c3914f4d0147a7ba7e8ddd53d Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Mon, 14 Feb 2022 17:49:38 +0000 Subject: [PATCH 1/5] Add jest-junit dependency --- site/package.json | 1 + site/yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/site/package.json b/site/package.json index 8c7ce86d4dac8..96569a0282cec 100644 --- a/site/package.json +++ b/site/package.json @@ -50,6 +50,7 @@ "formik": "2.2.9", "http-proxy-middleware": "2.0.3", "jest": "27.5.1", + "jest-junit": "13.0.0", "jest-runner-eslint": "1.0.0", "next": "12.0.10", "next-router-mock": "^0.6.5", diff --git a/site/yarn.lock b/site/yarn.lock index 4753c274bfb64..68a193de37f31 100644 --- a/site/yarn.lock +++ b/site/yarn.lock @@ -8499,6 +8499,16 @@ jest-jasmine2@^27.5.1: pretty-format "^27.5.1" throat "^6.0.1" +jest-junit@13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-13.0.0.tgz#479be347457aad98ae8a5983a23d7c3ec526c9a3" + integrity sha512-JSHR+Dhb32FGJaiKkqsB7AR3OqWKtldLd6ZH2+FJ8D4tsweb8Id8zEVReU4+OlrRO1ZluqJLQEETm+Q6/KilBg== + dependencies: + mkdirp "^1.0.4" + strip-ansi "^6.0.1" + uuid "^8.3.2" + xml "^1.0.1" + jest-leak-detector@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8" @@ -12655,6 +12665,11 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + v8-compile-cache-lib@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8" @@ -13020,6 +13035,11 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== +xml@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" + integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU= + xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" From 4a51c0543c1fee43bcf3f4f7ce39a8358f7775f9 Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Mon, 14 Feb 2022 18:06:36 +0000 Subject: [PATCH 2/5] Generate junit.xml; ignore in git --- .gitignore | 1 + site/.eslintignore | 3 ++- site/.prettierignore | 1 + site/jest.config.js | 7 +++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7466173fcab2f..16a31c9d50b58 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ site/.eslintcache site/.next/ site/node_modules/ site/storybook-static/ +site/test_results/ site/yarn-error.log coverage/ diff --git a/site/.eslintignore b/site/.eslintignore index 3c2ab0726d961..f802bce56b464 100644 --- a/site/.eslintignore +++ b/site/.eslintignore @@ -6,4 +6,5 @@ vendor out coverage .next -storybook-static \ No newline at end of file +storybook-static +test_results \ No newline at end of file diff --git a/site/.prettierignore b/site/.prettierignore index b41c6695956ec..1be0aa8af00cb 100644 --- a/site/.prettierignore +++ b/site/.prettierignore @@ -15,3 +15,4 @@ yarn-error.log coverage/ out/ storybook-static/ +test_results/ diff --git a/site/jest.config.js b/site/jest.config.js index 9e85a8ce66d55..ebf9e92258993 100644 --- a/site/jest.config.js +++ b/site/jest.config.js @@ -9,6 +9,7 @@ module.exports = { coverageReporters: ["text", "lcov"], displayName: "test", preset: "ts-jest", + roots: [""], setupFilesAfterEnv: ["/_jest/setupTests.ts"], transform: { @@ -43,4 +44,10 @@ module.exports = { "!/out/**/*.*", "!/storybook-static/**/*.*", ], + reporters: [ "default", + ["jest-junit", { + suiteName: "Front-end Jest Tests", + outputDirectory: "./test_results", + outputName: "junit.xml", + }]], } From 096edd29fd30b664a1edf9cd1f3dfd1c98c64181 Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Mon, 14 Feb 2022 18:08:01 +0000 Subject: [PATCH 3/5] Add datadog reporting for front-end tests --- .github/workflows/coder.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml index e8acb4ea7d2ec..4f9b5eb06ac36 100644 --- a/.github/workflows/coder.yaml +++ b/.github/workflows/coder.yaml @@ -262,3 +262,11 @@ jobs: files: ./site/coverage/lcov.info flags: unittest-js fail_ci_if_error: true + + - name: Upload DataDog Trace + if: (success() || failure()) && github.actor != 'dependabot[bot]' + env: + DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} + DD_DATABASE: postgresql + GIT_COMMIT_MESSAGE: ${{ github.event.head_commit.message }} + run: go run scripts/datadog-cireport/main.go site/test_results/junit.xml From 9a71e8e27d963dc674c294877c283230a2c90d76 Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Mon, 14 Feb 2022 18:09:46 +0000 Subject: [PATCH 4/5] Formatting --- site/jest.config.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/site/jest.config.js b/site/jest.config.js index ebf9e92258993..0d58cf7396528 100644 --- a/site/jest.config.js +++ b/site/jest.config.js @@ -44,10 +44,15 @@ module.exports = { "!/out/**/*.*", "!/storybook-static/**/*.*", ], - reporters: [ "default", - ["jest-junit", { + reporters: [ + "default", + [ + "jest-junit", + { suiteName: "Front-end Jest Tests", outputDirectory: "./test_results", outputName: "junit.xml", - }]], + }, + ], + ], } From c59a8ccd32702fc5cd7f2265d8fb119420544b6e Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Mon, 14 Feb 2022 18:16:21 +0000 Subject: [PATCH 5/5] Install go, so the datadog helper script can run --- .github/workflows/coder.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml index 4f9b5eb06ac36..f75fee6d7aa5f 100644 --- a/.github/workflows/coder.yaml +++ b/.github/workflows/coder.yaml @@ -239,6 +239,11 @@ jobs: .eslintcache key: js-${{ runner.os }}-test-${{ hashFiles('**/yarn.lock') }} + # Go is required for uploading the test results to datadog + - uses: actions/setup-go@v2 + with: + go-version: "^1.17" + - uses: actions/setup-node@v2 with: node-version: "14" pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy