Skip to content

Commit db4d232

Browse files
bryphe-coderbryphe-coder
committed
Merge branch 'main' into bryphe/experiment/241/cross-plat-expect
2 parents 09a86e8 + 64c14de commit db4d232

File tree

9 files changed

+362
-313
lines changed

9 files changed

+362
-313
lines changed

‎.github/workflows/coder.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,11 @@ jobs:
239239
.eslintcache
240240
key: js-${{ runner.os }}-test-${{ hashFiles('**/yarn.lock') }}
241241

242+
# Go is required for uploading the test results to datadog
243+
- uses: actions/setup-go@v2
244+
with:
245+
go-version: "^1.17"
246+
242247
- uses: actions/setup-node@v2
243248
with:
244249
node-version: "14"
@@ -262,3 +267,11 @@ jobs:
262267
files: ./site/coverage/lcov.info
263268
flags: unittest-js
264269
fail_ci_if_error: true
270+
271+
- name: Upload DataDog Trace
272+
if: (success() || failure()) && github.actor != 'dependabot[bot]'
273+
env:
274+
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
275+
DD_DATABASE: postgresql
276+
GIT_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
277+
run: go run scripts/datadog-cireport/main.go site/test_results/junit.xml

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ site/.eslintcache
2020
site/.next/
2121
site/node_modules/
2222
site/storybook-static/
23+
site/test_results/
2324
site/yarn-error.log
2425
coverage/
2526

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ require (
4141
github.com/pion/transport v0.13.0
4242
github.com/pion/webrtc/v3 v3.1.23
4343
github.com/psanford/memfs v0.0.0-20210214183328-a001468d78ef
44-
github.com/quasilyte/go-ruleguard/dsl v0.3.16
44+
github.com/quasilyte/go-ruleguard/dsl v0.3.17
4545
github.com/spf13/cobra v1.3.0
4646
github.com/stretchr/testify v1.7.0
4747
github.com/unrolled/secure v1.0.9

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,8 +1106,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
11061106
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
11071107
github.com/psanford/memfs v0.0.0-20210214183328-a001468d78ef h1:NKxTG6GVGbfMXc2mIk+KphcH6hagbVXhcFkbTgYleTI=
11081108
github.com/psanford/memfs v0.0.0-20210214183328-a001468d78ef/go.mod h1:tcaRap0jS3eifrEEllL6ZMd9dg8IlDpi2S1oARrQ+NI=
1109-
github.com/quasilyte/go-ruleguard/dsl v0.3.16 h1:yJtIpd4oyNS+/c/gKqxNwoGO9+lPOsy1A4BzKjJRcrI=
1110-
github.com/quasilyte/go-ruleguard/dsl v0.3.16/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
1109+
github.com/quasilyte/go-ruleguard/dsl v0.3.17 h1:L5xf3nifnRIdYe9vyMuY2sDnZHIgQol/fDq74FQz7ZY=
1110+
github.com/quasilyte/go-ruleguard/dsl v0.3.17/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
11111111
github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
11121112
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
11131113
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=

‎site/.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ vendor
66
out
77
coverage
88
.next
9-
storybook-static
9+
storybook-static
10+
test_results

‎site/.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ yarn-error.log
1515
coverage/
1616
out/
1717
storybook-static/
18+
test_results/

‎site/jest.config.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = {
99
coverageReporters: ["text", "lcov"],
1010
displayName: "test",
1111
preset: "ts-jest",
12+
1213
roots: ["<rootDir>"],
1314
setupFilesAfterEnv: ["<rootDir>/_jest/setupTests.ts"],
1415
transform: {
@@ -43,4 +44,15 @@ module.exports = {
4344
"!<rootDir>/out/**/*.*",
4445
"!<rootDir>/storybook-static/**/*.*",
4546
],
47+
reporters: [
48+
"default",
49+
[
50+
"jest-junit",
51+
{
52+
suiteName: "Front-end Jest Tests",
53+
outputDirectory: "./test_results",
54+
outputName: "junit.xml",
55+
},
56+
],
57+
],
4658
}

‎site/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"@material-ui/icons": "4.5.1",
2323
"@material-ui/lab": "4.0.0-alpha.42",
2424
"@react-theming/storybook-addon": "1.1.5",
25-
"@storybook/addon-actions": "6.4.18",
26-
"@storybook/addon-essentials": "6.4.18",
27-
"@storybook/addon-links": "6.4.18",
28-
"@storybook/react": "6.4.18",
25+
"@storybook/addon-actions": "6.4.19",
26+
"@storybook/addon-essentials": "6.4.19",
27+
"@storybook/addon-links": "6.4.19",
28+
"@storybook/react": "6.4.19",
2929
"@testing-library/react": "12.1.2",
3030
"@types/express": "4.17.13",
3131
"@types/jest": "27.4.0",
@@ -50,6 +50,7 @@
5050
"formik": "2.2.9",
5151
"http-proxy-middleware": "2.0.3",
5252
"jest": "27.5.1",
53+
"jest-junit": "13.0.0",
5354
"jest-runner-eslint": "1.0.0",
5455
"next": "12.0.10",
5556
"next-router-mock": "^0.6.5",

0 commit comments

Comments
 (0)