Fix build issues

package.json

@@ -17,6 +17,7 @@
   },
   "dependencies": {
     "@khanacademy/kas": "github:openstax/raise-kas#7f1de183d58ff9b241a51062c307ea5e9ef0c3fe",
+    "@types/jest": "^29.5.12",
     "bootstrap": "^5.3.3",
     "formik": "^2.4.6",
     "mathlive": "^0.98.6",
@@ -38,9 +39,9 @@
     "@types/uuid": "^9.0.8",
     "@vitejs/plugin-react": "^4.3.0",
     "eslint": "^8.57.0",
+    "eslint-config-love": "^52.0.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
     "msw": "^2.3.1",
-    "eslint-config-love": "^52.0.0",
     "sass": "^1.76.0",
     "stylelint": "^16.5.0",
     "stylelint-config-standard": "^36.0.0",

src/tests/ContentLoader.test.tsx

@@ -1,7 +1,7 @@
 import { http, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
 import { render, screen, waitFor } from '@testing-library/react'
-import { vi, test, expect } from 'vitest'
+import { vi, test, expect, beforeAll, afterEach, afterAll } from 'vitest'
 
 import { ContentLoader } from '../components/ContentLoader'
 

src/tests/DropdownProblem.test.tsx

@@ -1,6 +1,6 @@
 import { fireEvent, render, screen, act } from '@testing-library/react'
 import { DropdownProblem, buildClassName } from '../components/DropdownProblem'
-import { vi, test } from 'vitest'
+import { vi, test, expect} from 'vitest'
 
 
 test('DropdownProblem renders with contentId', async () => {

src/tests/MoodleApi.test.ts

@@ -1,7 +1,7 @@
 import { MoodleApi } from '../moodleapi'
 import { setupServer } from 'msw/node'
 import { http, HttpResponse } from 'msw'
-import { vi, test, expect } from 'vitest'
+import { vi, test, expect, beforeAll, afterEach, afterAll} from 'vitest'
 
 const server = setupServer(
   http.post('http://moodle/lib/ajax/service.php', () => {

src/tests/ProblemSetBlock.test.tsx

@@ -1,6 +1,6 @@
 import { render, screen, fireEvent, act } from '@testing-library/react'
 import { OS_RAISE_IB_EVENT_PREFIX, parseProblemSetBlock } from '../lib/blocks'
-import { vi, test, expect } from 'vitest'
+import { vi, test, expect, afterEach } from 'vitest'
 
 import {
   type BaseProblemProps,

src/tests/SearchBlock.test.tsx

@@ -1,6 +1,6 @@
 import { act, fireEvent, render, screen } from '@testing-library/react'
 import { SearchBlock } from '../components/SearchBlock'
-import { vi, describe, expect } from 'vitest'
+import { vi, describe, expect, it } from 'vitest'
 
 const mockStudentAndTeacherQueryResults = {
   hits: {

src/tests/TooltipBlock.test.tsx

@@ -2,7 +2,7 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { TooltipBlock } from '../components/TooltipBlock'
 import { mathifyElement } from '../lib/math'
-import { vi, test } from 'vitest'
+import { vi, test, expect } from 'vitest'
 
 vi.mock('../lib/math.ts', () => ({
   mathifyElement: vi.fn(async () => {})

src/tests/UserInputBlock.test.tsx

@@ -1,7 +1,7 @@
 import { render, screen, fireEvent, act } from '@testing-library/react'
 import { UserInputBlock, MAX_CHARACTER_INPUT_BLOCK_LENGTH } from '../components/UserInputBlock'
 import { parseUserInputBlock, OS_RAISE_IB_EVENT_PREFIX } from '../lib/blocks'
-import { vi, test, expect } from 'vitest'
+import { vi, test, expect, afterEach } from 'vitest'
 
 import { ContentLoadedContext } from '../lib/contexts'
 import { queueIbInputSubmittedV1Event } from '../lib/events'

src/tests/content.test.ts

@@ -1,5 +1,5 @@
 import { getVersionId } from '../lib/utils'
-import { vi, test, expect } from 'vitest'
+import { vi, test, expect, beforeEach, afterEach} from 'vitest'
 vi.mock('../lib/env.ts', () => ({
   default: {}
 }))

src/tests/events.test.ts

@@ -7,7 +7,7 @@ import {
   queueIbInputSubmittedV1Event
 } from '../lib/events'
 import { validate } from 'uuid'
-import { vi } from 'vitest'
+import { vi, beforeAll, afterAll, afterEach, test, expect } from 'vitest'
 const server = setupServer(
   http.post('http://localhost:8888/v1/events', () => {
     return HttpResponse.json({
@@ -51,7 +51,7 @@ async function waitForRequest(method: string, url: string): Promise<Request> {
 
 vi.mock('../lib/env.ts', () => ({
   ENV: {
-    OS_RAISE_EVENTSAPI_URL_MAP: { localhost: 'http://localhost:8888' },
+    OS_RAISE_EVENTSAPI_URL_MAP: { 'localhost:3000': 'http://localhost:8888' },
     EVENT_FLUSH_PERIOD: 1
   }
 }))
@@ -82,85 +82,85 @@ test('Simultaneous requests result in a single EventManager instance', async ()
   expect(jsonData.length).toBe(2)
 })
 
-// test('Test queueContentLoadedV1Event', async () => {
-//   const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
-//   await queueContentLoadedV1Event(1, '1234', 'main')
-//   const req = await pendingRequest
-//   const jsonData = await req.json()
-//   expect(jsonData[0].content_id).toBe('1234')
-//   expect(jsonData[0].eventname).toBe('content_loaded_v1')
-//   expect(jsonData[0].variant).toBe('main')
-//   expect(validate(jsonData[0].impression_id as string)).toBe(true)
-//   expect(jsonData[0].course_id).toBe(1)
-// })
+test('Test queueContentLoadedV1Event', async () => {
+  const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
+  await queueContentLoadedV1Event(1, '1234', 'main')
+  const req = await pendingRequest
+  const jsonData = await req.json()
+  expect(jsonData[0].content_id).toBe('1234')
+  expect(jsonData[0].eventname).toBe('content_loaded_v1')
+  expect(jsonData[0].variant).toBe('main')
+  expect(validate(jsonData[0].impression_id as string)).toBe(true)
+  expect(jsonData[0].course_id).toBe(1)
+})
 
-// test('Test queueContentLoadFailedV1Event', async () => {
-//   const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
-//   await queueContentLoadFailedV1Event(1, '1234', 'error')
-//   const req = await pendingRequest
-//   const jsonData = await req.json()
-//   expect(jsonData[0].content_id).toBe('1234')
-//   expect(jsonData[0].eventname).toBe('content_load_failed_v1')
-//   expect(jsonData[0].error).toBe('error')
-//   expect(validate(jsonData[0].impression_id as string)).toBe(true)
-//   expect(jsonData[0].course_id).toBe(1)
-// })
+test('Test queueContentLoadFailedV1Event', async () => {
+  const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
+  await queueContentLoadFailedV1Event(1, '1234', 'error')
+  const req = await pendingRequest
+  const jsonData = await req.json()
+  expect(jsonData[0].content_id).toBe('1234')
+  expect(jsonData[0].eventname).toBe('content_load_failed_v1')
+  expect(jsonData[0].error).toBe('error')
+  expect(validate(jsonData[0].impression_id as string)).toBe(true)
+  expect(jsonData[0].course_id).toBe(1)
+})
 
-// test('Test queueIbPsetProblemAttemptedV1Event', async () => {
-//   const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
-//   await queueIbPsetProblemAttemptedV1Event(
-//     1,
-//     '1234',
-//     'variant',
-//     'input',
-//     'this is the response',
-//     true,
-//     1,
-//     false,
-//     'abcd1',
-//     'efgh2'
-//   )
-//   const req = await pendingRequest
-//   const jsonData = await req.json()
-//   expect(jsonData[0].timestamp).toBe(1)
-//   expect(jsonData[0].content_id).toBe('1234')
-//   expect(jsonData[0].variant).toBe('variant')
-//   expect(jsonData[0].problem_type).toBe('input')
-//   expect(jsonData[0].response).toBe('this is the response')
-//   expect(jsonData[0].correct).toBe(true)
-//   expect(jsonData[0].attempt).toBe(1)
-//   expect(jsonData[0].final_attempt).toBe(false)
-//   expect(jsonData[0].pset_content_id).toBe('abcd1')
-//   expect(jsonData[0].pset_problem_content_id).toBe('efgh2')
-//   expect(jsonData[0].eventname).toBe('ib_pset_problem_attempted_v1')
-//   expect(validate(jsonData[0].impression_id as string)).toBe(true)
-//   expect(jsonData[0].course_id).toBe(1)
-// })
+test('Test queueIbPsetProblemAttemptedV1Event', async () => {
+  const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
+  await queueIbPsetProblemAttemptedV1Event(
+    1,
+    '1234',
+    'variant',
+    'input',
+    'this is the response',
+    true,
+    1,
+    false,
+    'abcd1',
+    'efgh2'
+  )
+  const req = await pendingRequest
+  const jsonData = await req.json()
+  expect(jsonData[0].timestamp).toBe(1)
+  expect(jsonData[0].content_id).toBe('1234')
+  expect(jsonData[0].variant).toBe('variant')
+  expect(jsonData[0].problem_type).toBe('input')
+  expect(jsonData[0].response).toBe('this is the response')
+  expect(jsonData[0].correct).toBe(true)
+  expect(jsonData[0].attempt).toBe(1)
+  expect(jsonData[0].final_attempt).toBe(false)
+  expect(jsonData[0].pset_content_id).toBe('abcd1')
+  expect(jsonData[0].pset_problem_content_id).toBe('efgh2')
+  expect(jsonData[0].eventname).toBe('ib_pset_problem_attempted_v1')
+  expect(validate(jsonData[0].impression_id as string)).toBe(true)
+  expect(jsonData[0].course_id).toBe(1)
+})
 
-// test('Test queueIbInputSubmittedV1Event', async () => {
-//   const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
-//   await queueIbInputSubmittedV1Event(
-//     1,
-//     'content-id',
-//     'variant',
-//     'this is the response',
-//     'input-content-id'
-//   )
-//   const req = await pendingRequest
-//   const jsonData = await req.json()
-//   expect(jsonData[0].timestamp).toBe(1)
-//   expect(jsonData[0].content_id).toBe('content-id')
-//   expect(jsonData[0].variant).toBe('variant')
-//   expect(jsonData[0].response).toBe('this is the response')
-//   expect(jsonData[0].input_content_id).toBe('input-content-id')
-//   expect(jsonData[0].eventname).toBe('ib_input_submitted_v1')
-//   expect(validate(jsonData[0].impression_id as string)).toBe(true)
-//   expect(jsonData[0].course_id).toBe(1)
-// })
+test('Test queueIbInputSubmittedV1Event', async () => {
+  const pendingRequest = waitForRequest('POST', 'http://localhost:8888/v1/events')
+  await queueIbInputSubmittedV1Event(
+    1,
+    'content-id',
+    'variant',
+    'this is the response',
+    'input-content-id'
+  )
+  const req = await pendingRequest
+  const jsonData = await req.json()
+  expect(jsonData[0].timestamp).toBe(1)
+  expect(jsonData[0].content_id).toBe('content-id')
+  expect(jsonData[0].variant).toBe('variant')
+  expect(jsonData[0].response).toBe('this is the response')
+  expect(jsonData[0].input_content_id).toBe('input-content-id')
+  expect(jsonData[0].eventname).toBe('ib_input_submitted_v1')
+  expect(validate(jsonData[0].impression_id as string)).toBe(true)
+  expect(jsonData[0].course_id).toBe(1)
+})
 
-// test('Test timer resets itself after flushing', async () => {
-//   await queueContentLoadFailedV1Event(1, '1234', 'error')
-//   await waitForRequest('POST', 'http://localhost:8888/v1/events')
-//   await queueContentLoadFailedV1Event(1, '12345', 'error2')
-//   await waitForRequest('POST', 'http://localhost:8888/v1/events')
-// })
+test('Test timer resets itself after flushing', async () => {
+  await queueContentLoadFailedV1Event(1, '1234', 'error')
+  await waitForRequest('POST', 'http://localhost:8888/v1/events')
+  await queueContentLoadFailedV1Event(1, '12345', 'error2')
+  await waitForRequest('POST', 'http://localhost:8888/v1/events')
+})

src/tests/vitest.setup.ts

@@ -3,7 +3,7 @@ import { vi } from 'vitest'
 
 window.mathVirtualKeyboard = {
   layouts: {}
-}
+} as any
 
 vi.mock('mathlive', () => ({
   MathfieldElement: {

vite.config.mts

@@ -10,11 +10,6 @@ export default defineConfig(({ mode }) => {
       environment: 'jsdom',
       setupFiles: './src/tests/vitest.setup.ts',
       include: ['src/tests/*.test.{ts,tsx}'],
-      environmentOptions: {
-        jsdom: {
-          url: 'http://localhost/',
-        },
-      },
     },
 
     build: {