Skip to content

Commit 7c1a63f

Browse files
ammarioammario
committed
Get FE tests passing with real data!
1 parent 902f3fa commit 7c1a63f

File tree

5 files changed

+90
-17
lines changed

5 files changed

+90
-17
lines changed

‎site/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
"@typescript-eslint/eslint-plugin": "5.31.0",
9191
"@typescript-eslint/parser": "5.31.0",
9292
"@xstate/cli": "0.3.0",
93+
"canvas": "^2.9.3",
9394
"chromatic": "6.7.1",
9495
"copy-webpack-plugin": "10.2.4",
9596
"css-loader": "6.7.1",
@@ -116,6 +117,7 @@
116117
"prettier": "2.7.1",
117118
"prettier-plugin-organize-imports": "3.0.0",
118119
"react-hot-loader": "4.13.0",
120+
"resize-observer": "^1.0.4",
119121
"semver": "^7.3.7",
120122
"sql-formatter": "8.2.0",
121123
"style-loader": "3.3.1",

‎site/src/api/typesGenerated.ts

+6-10
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,6 @@ export interface CreateWorkspaceRequest {
183183
readonly parameter_values?: CreateParameterRequest[]
184184
}
185185

186-
<<<<<<< HEAD
187-
// From codersdk/workspaceresources.go
188-
export interface DERPRegion {
189-
readonly preferred: boolean
190-
readonly latency_ms: number
191-
}
192-
193-
||||||| parent of 1150cd02... agent: add StatsReporter
194-
=======
195186
// From codersdk/metrics.go
196187
export interface DAUEntry {
197188
readonly date: string
@@ -203,7 +194,12 @@ export interface DAUsResponse {
203194
readonly entries: DAUEntry[]
204195
}
205196

206-
>>>>>>> 1150cd02... agent: add StatsReporter
197+
// From codersdk/workspaceresources.go
198+
export interface DERPRegion {
199+
readonly preferred: boolean
200+
readonly latency_ms: number
201+
}
202+
207203
// From codersdk/features.go
208204
export interface Entitlements {
209205
readonly features: Record<string, Feature>

‎site/src/pages/UsersPage/UsersPage.test.tsx

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable @typescript-eslint/no-floating-promises */
22
import { fireEvent, screen, waitFor, within } from "@testing-library/react"
33
import { rest } from "msw"
4+
import { ResizeObserver } from "resize-observer"
45
import { Language as usersXServiceLanguage } from "xServices/users/usersXService"
56
import * as API from "../../api/api"
67
import { Role } from "../../api/typesGenerated"
@@ -20,6 +21,10 @@ import { permissionsToCheck } from "../../xServices/auth/authXService"
2021
import { Language as UsersPageLanguage, UsersPage } from "./UsersPage"
2122
import { Language as UsersViewLanguage } from "./UsersPageView"
2223

24+
Object.defineProperty(window, "ResizeObserver", {
25+
value: ResizeObserver,
26+
})
27+
2328
const suspendUser = async (setupActionSpies: () => void) => {
2429
// Get the first user in the table
2530
const users = await screen.findAllByText(/.*@coder.com/)

‎site/src/testHelpers/entities.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import * as TypesGen from "../api/typesGenerated"
44

55
export const MockGetDAUResponse: TypesGen.DAUsResponse = {
66
entries: [
7-
// For the time being, we don't test the canvas
8-
// generated by a rendered chart.
9-
// { date: "2022-08-27T00:00:00Z", daus: 1 },
10-
// { date: "2022-08-29T00:00:00Z", daus: 2 },
11-
// { date: "2022-08-30T00:00:00Z", daus: 1 },
7+
{ date: "2022-08-27T00:00:00Z", daus: 1 },
8+
{ date: "2022-08-29T00:00:00Z", daus: 2 },
9+
{ date: "2022-08-30T00:00:00Z", daus: 1 },
1210
],
1311
}
1412
export const MockSessionToken: TypesGen.LoginWithPasswordResponse = {

‎site/yarn.lock

+74-2
Original file line numberDiff line numberDiff line change
@@ -1607,6 +1607,21 @@
16071607
resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
16081608
integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
16091609

1610+
"@mapbox/node-pre-gyp@^1.0.0":
1611+
version "1.0.9"
1612+
resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc"
1613+
integrity sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==
1614+
dependencies:
1615+
detect-libc "^2.0.0"
1616+
https-proxy-agent "^5.0.0"
1617+
make-dir "^3.1.0"
1618+
node-fetch "^2.6.7"
1619+
nopt "^5.0.0"
1620+
npmlog "^5.0.1"
1621+
rimraf "^3.0.2"
1622+
semver "^7.3.5"
1623+
tar "^6.1.11"
1624+
16101625
"@material-ui/core@4.9.4":
16111626
version "4.9.4"
16121627
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.4.tgz#796515b12845dc6ea7e21872888cfc4c0c1c1efe"
@@ -3936,6 +3951,11 @@ abab@^2.0.3, abab@^2.0.5:
39363951
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
39373952
integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
39383953

3954+
abbrev@1:
3955+
version "1.1.1"
3956+
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
3957+
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
3958+
39393959
accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
39403960
version "1.3.8"
39413961
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -5050,6 +5070,15 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001304, can
50505070
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001376.tgz#af2450833e5a06873fbb030a9556ca9461a2736d"
50515071
integrity sha512-I27WhtOQ3X3v3it9gNs/oTpoE5KpwmqKR5oKPA8M0G7uMXh9Ty81Q904HpKUrM30ei7zfcL5jE7AXefgbOfMig==
50525072

5073+
canvas@^2.9.3:
5074+
version "2.9.3"
5075+
resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.9.3.tgz#8723c4f970442d4cdcedba5221579f9660a58bdb"
5076+
integrity sha512-WOUM7ghii5TV2rbhaZkh1youv/vW1/Canev6Yx6BG2W+1S07w8jKZqKkPnbiPpQEDsnJdN8ouDd7OvQEGXDcUw==
5077+
dependencies:
5078+
"@mapbox/node-pre-gyp" "^1.0.0"
5079+
nan "^2.15.0"
5080+
simple-get "^3.0.3"
5081+
50535082
capture-exit@^2.0.0:
50545083
version "2.0.0"
50555084
resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -5966,6 +5995,13 @@ decode-uri-component@^0.2.0:
59665995
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
59675996
integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
59685997

5998+
decompress-response@^4.2.0:
5999+
version "4.2.1"
6000+
resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
6001+
integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==
6002+
dependencies:
6003+
mimic-response "^2.0.0"
6004+
59696005
dedent@^0.7.0:
59706006
version "0.7.0"
59716007
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -6085,6 +6121,11 @@ detab@2.0.4:
60856121
dependencies:
60866122
repeat-string "^1.5.4"
60876123

6124+
detect-libc@^2.0.0:
6125+
version "2.0.1"
6126+
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
6127+
integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
6128+
60886129
detect-newline@^3.0.0:
60896130
version "3.1.0"
60906131
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -10150,6 +10191,11 @@ mimic-fn@^2.1.0:
1015010191
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
1015110192
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
1015210193

10194+
mimic-response@^2.0.0:
10195+
version "2.1.0"
10196+
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
10197+
integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==
10198+
1015310199
min-document@^2.19.0:
1015410200
version "2.19.0"
1015510201
resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
@@ -10360,7 +10406,7 @@ mute-stream@0.0.8:
1036010406
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
1036110407
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
1036210408

10363-
nan@^2.12.1:
10409+
nan@^2.12.1, nan@^2.15.0:
1036410410
version "2.16.0"
1036510411
resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916"
1036610412
integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
@@ -10483,6 +10529,13 @@ node-releases@^2.0.6:
1048310529
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
1048410530
integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
1048510531

10532+
nopt@^5.0.0:
10533+
version "5.0.0"
10534+
resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
10535+
integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
10536+
dependencies:
10537+
abbrev "1"
10538+
1048610539
normalize-package-data@^2.5.0:
1048710540
version "2.5.0"
1048810541
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -12243,6 +12296,11 @@ requires-port@^1.0.0:
1224312296
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
1224412297
integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
1224512298

12299+
resize-observer@^1.0.4:
12300+
version "1.0.4"
12301+
resolved "https://registry.yarnpkg.com/resize-observer/-/resize-observer-1.0.4.tgz#48beb64602ce408ebd1a433784d64ef76f38d321"
12302+
integrity sha512-AQ2MdkWTng9d6JtjHvljiQR949qdae91pjSNugGGeOFzKIuLHvoZIYhUTjePla5hCFDwQHrnkciAIzjzdsTZew==
12303+
1224612304
resolve-cwd@^3.0.0:
1224712305
version "3.0.0"
1224812306
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -12681,6 +12739,20 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
1268112739
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
1268212740
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
1268312741

12742+
simple-concat@^1.0.0:
12743+
version "1.0.1"
12744+
resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
12745+
integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
12746+
12747+
simple-get@^3.0.3:
12748+
version "3.1.1"
12749+
resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55"
12750+
integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==
12751+
dependencies:
12752+
decompress-response "^4.2.0"
12753+
once "^1.3.1"
12754+
simple-concat "^1.0.0"
12755+
1268412756
sirv@^1.0.7:
1268512757
version "1.0.19"
1268612758
resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
@@ -13239,7 +13311,7 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
1323913311
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
1324013312
integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
1324113313

13242-
tar@^6.0.2:
13314+
tar@^6.0.2, tar@^6.1.11:
1324313315
version "6.1.11"
1324413316
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
1324513317
integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==

0 commit comments

Comments
 (0)