fix broken redirect with prompt & tests

Author: Veikkosuhonen

e2e/chat.spec.ts

@@ -16,7 +16,7 @@ testMatrix.forEach((testConfig) => {
   testConfig.courses.forEach((course) => {
     test.describe(`${course ? `Course` : 'General'} chat test for ${testConfig.role}`, () => {
       test.beforeEach(async ({ page }) => {
-        await page.goto(`/v2/${course || ''}`)
+        await page.goto(`/${course || ''}`)
       })
 
       test('Disclaimer is visible', async ({ page }) => {
@@ -87,17 +87,17 @@ testMatrix.forEach((testConfig) => {
         await acceptDisclaimer(page)
         await useMockModel(page)
 
-        await sendChatMessage(page, 'tää tyhjennetään')
+        await sendChatMessage(page, 'say minttujam')
 
         await closeSendPreference(page)
 
-        await expect(page.getByTestId('user-message')).toContainText('tää tyhjennetään')
-        await expect(page.getByTestId('assistant-message')).toContainText('OVER', { timeout: 6000 })
+        await expect(page.getByTestId('user-message')).toContainText('say minttujam')
+        await expect(page.getByTestId('assistant-message')).toContainText('minttujam')
 
-        await sendChatMessage(page, 'ja tämä')
+        await sendChatMessage(page, 'say minttujam2')
 
-        await expect(page.getByTestId('user-message')).toContainText('ja tämä')
-        await expect(page.getByTestId('assistant-message')).toContainText('OVER', { timeout: 6000 })
+        await expect(page.getByTestId('user-message').nth(1)).toContainText('say minttujam2')
+        await expect(page.getByTestId('assistant-message').nth(1)).toContainText('minttujam2')
 
         page.on('dialog', (dialog) => dialog.accept())
         await page.getByTestId('empty-conversation-button').click()

e2e/prompts.spec.ts

@@ -4,7 +4,7 @@ import { acceptDisclaimer, closeSendPreference, sendChatMessage } from './utils/
 
 test.describe('Prompts', () => {
   test('Custom prompt text works', async ({ page }) => {
-    await page.goto('/v2')
+    await page.goto('/')
 
     await acceptDisclaimer(page)
 
@@ -66,7 +66,7 @@ test.describe('Prompts', () => {
     await page.getByTestId('settings-button').click()
 
     // The prompt is active.
-    expect(page.getByText(newPromptName)).toBeVisible()
+    await expect(page.getByText(newPromptName)).toBeVisible()
 
     // When prompt selector is opened, it is also visible in the list, so 2 times:
     await page.getByTestId('prompt-selector-button').click()
@@ -106,7 +106,7 @@ test.describe('Prompts', () => {
 
   test('Own prompts work in course chat and normal chat', async ({ page }) => {
     // First create own prompt in course chat view
-    await page.goto('/v2/test-course')
+    await page.goto('/test-course')
     await acceptDisclaimer(page)
     await page.getByTestId('settings-button').click()
 
@@ -127,7 +127,7 @@ test.describe('Prompts', () => {
     await expect(page.getByText(newPromptName, { exact: true })).toHaveCount(2) // Visible in the button and in the menu list
 
     // Now go to normal chat
-    await page.goto('/v2')
+    await page.goto('/')
     await page.getByTestId('settings-button').click()
 
     // Own prompt is visible in normal chat

e2e/student.spec.ts

@@ -4,7 +4,7 @@ import { studentTest as test } from './fixtures'
 
 test.describe('Student', () => {
   test('Enrolled chat works', async ({ page }) => {
-    await page.goto('/v2/test-course')
+    await page.goto('/test-course')
     await acceptDisclaimer(page)
 
     await page.getByTestId('model-selector').first().click()
@@ -19,17 +19,17 @@ test.describe('Student', () => {
 
   test('is sent to chats page from general chat', async ({ page }) => {
     // Tries to access general chat
-    await page.goto('/v2')
+    await page.goto('/')
     // Student is sent to chats page
-    await expect(page).not.toHaveURL(/v2\/sandbox/)
+    await expect(page).not.toHaveURL(/sandbox/)
     await expect(page).toHaveURL(/chats/)
   })
 
   test('is sent to chats page from non-enrolled course', async ({ page }) => {
     // Tries to access sandbox course
-    await page.goto('/v2/sandbox')
+    await page.goto('/sandbox')
     // Student is sent to chats page
-    await expect(page).not.toHaveURL(/v2\/sandbox/)
+    await expect(page).not.toHaveURL(/sandbox/)
     await expect(page).toHaveURL(/chats/)
   })
 })

playwright.config.ts

@@ -22,7 +22,7 @@ export default defineConfig({
   /* Global timeout for each test */
   timeout: inCI ? 20_000 : 15_000,
   expect: {
-    timeout: inCI ? 4_500 : 3000,
+    timeout: inCI ? 5_000 : 4000,
   },
   /* Opt out of parallel tests on CI. */
   // workers: inCI ? 1 : undefined,

scripts/k6_load_test.js

@@ -71,7 +71,7 @@ function handleTokens(tokenizedStr) {
 }
 
 export default function () {
-  const url = `${staging}/v2`
+  const url = `${staging}/`
   let prevResponseId = ''
 
   for (const message of messages) {

src/client/components/Courses/Course/Prompt.tsx

@@ -29,7 +29,7 @@ const Prompt = ({ prompt, handleDelete, mandatoryPromptId }: { prompt: PromptTyp
   const [updatedName, setUpdatedName] = useState(name)
   const [updatedHidden, setUpdatedHidden] = useState(hidden)
   const [updatedMandatory, setUpdatedMandatory] = useState(mandatory)
-  const chatPath = `/v2/${courseId}?promptId=${id}`
+  const chatPath = `/${courseId}?promptId=${id}`
   const directLink = `${window.location.origin}${PUBLIC_URL}/${chatPath}`
 
   const handleSave = async () => {
@@ -107,7 +107,7 @@ const Prompt = ({ prompt, handleDelete, mandatoryPromptId }: { prompt: PromptTyp
             {!editPrompt ? (
               <>
                 <Box width="80%">
-                  <SystemMessage system={systemMessage} setSystem={() => { }} showInfo={false} disabled />
+                  <SystemMessage system={systemMessage} setSystem={() => {}} showInfo={false} disabled />
                 </Box>
                 <Box>
                   {messages.map(({ role, content }, index) => (

src/client/components/Courses/Course/index.tsx

@@ -49,7 +49,7 @@ const Course = () => {
 
   if (userLoading || !user || !isCourseSuccess) return null
 
-  const studentLink = `${window.location.origin}${PUBLIC_URL}/v2/${chatInstance.courseId}`
+  const studentLink = `${window.location.origin}${PUBLIC_URL}/${chatInstance.courseId}`
 
   const amongResponsibles = chatInstance.responsibilities ? chatInstance.responsibilities.some((r) => r.user.id === user.id) : false