Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix test suite after combination of extended tests with new live quiz URLs #4369

Merged
merged 3 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/frontend-manage/src/components/sessions/Session.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ function Session({ session }: SessionProps) {
disabled={startingQuiz}
onClick={async () => {
await startSession()
router.push(`sessions/${session.id}/cockpit`)
router.push(`quizzes/${session.id}/cockpit`)
}}
data={{ cy: `start-session-${session.name}` }}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/office-addin/src/content/components/URLForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function URLForm({ slideID }: URLFormProps) {
labelType="large"
tooltip="Enter the embedding URL of the evaluation you want to add to this slide"
className={{ root: 'w-full' }}
placeholder="https://manage.klicker.uzh.ch/sessions/12345/evaluation?hmac=xyz"
placeholder="https://manage.klicker.uzh.ch/quizzes/12345/evaluation?hmac=xyz"
data={{ cy: 'url-form-input' }}
/>
<Button type="submit">Embed</Button>
Expand Down
4 changes: 2 additions & 2 deletions cypress/cypress/e2e/E-course-workflow.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ describe('Test course creation and editing functionalities', () => {
cy.reload()

// create a question with sample solution
cy.get('[data-cy="questions"]').click()
cy.get('[data-cy="library"]').click()
cy.createQuestionSC({
title: questionTitle,
content: questionContent,
Expand Down Expand Up @@ -599,7 +599,7 @@ describe('Test course creation and editing functionalities', () => {
)

// check that the live quiz has been removed from the course
cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()
cy.contains('[data-cy="session-block"]', liveQuizName)
cy.get(`[data-cy="edit-session-${liveQuizName}"]`).click()
cy.get('[data-cy="next-or-submit"]').click()
Expand Down
20 changes: 10 additions & 10 deletions cypress/cypress/e2e/F-live-quiz-workflow.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ describe('Different live-quiz workflows', () => {

it('Edit the created session and check if all settings persist', () => {
cy.loginLecturer()
cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()

cy.contains('[data-cy="session-block"]', sessionName1)
cy.get(`[data-cy="edit-session-${sessionName1}"]`).click()
Expand Down Expand Up @@ -489,7 +489,7 @@ describe('Different live-quiz workflows', () => {

it('Duplicate the live quiz', () => {
cy.loginLecturer()
cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()
cy.contains('[data-cy="session-block"]', sessionName1New)

// duplicate the session and verify that the content is the same as for the original session
Expand Down Expand Up @@ -523,7 +523,7 @@ describe('Different live-quiz workflows', () => {

it('Cleanup: Delete the duplicated live quiz', () => {
cy.loginLecturer()
cy.get(`[data-cy="sessions"]`).click()
cy.get(`[data-cy="quizzes"]`).click()
cy.findByText(sessionName1Dupl).should('exist')
cy.get(`[data-cy="delete-live-quiz-${sessionName1Dupl}"]`).click()
cy.get(`[data-cy="confirm-delete-live-quiz"]`).click()
Expand All @@ -533,7 +533,7 @@ describe('Different live-quiz workflows', () => {
// ! Part 2: Live Quiz Control
it('Start the created live quizzes, abort it, and restart & completes it', () => {
cy.loginLecturer()
cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()
cy.contains('[data-cy="session-block"]', sessionName1New)

// start session and then abort it
Expand Down Expand Up @@ -568,7 +568,7 @@ describe('Different live-quiz workflows', () => {

it('Cleanup: Delete the created and completed live quiz', () => {
cy.loginLecturer()
cy.get(`[data-cy="sessions"]`).click()
cy.get(`[data-cy="quizzes"]`).click()

cy.findByText(sessionName1New).should('exist')
cy.get(`[data-cy="delete-live-quiz-${sessionName1New}"]`).click()
Expand Down Expand Up @@ -697,7 +697,7 @@ describe('Different live-quiz workflows', () => {

it('Start the second block of the live quiz', () => {
cy.loginLecturer()
cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()
cy.get(`[data-cy="session-cockpit-${sessionName2}"]`).click()
cy.wait(1000)

Expand All @@ -709,7 +709,7 @@ describe('Different live-quiz workflows', () => {

it('Make feedbacks visible, respond to one and disable moderation', () => {
cy.loginLecturer()
cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()
cy.get(`[data-cy="session-cockpit-${sessionName2}"]`).click()
cy.wait(1000)

Expand Down Expand Up @@ -763,7 +763,7 @@ describe('Different live-quiz workflows', () => {
it('Close block and delete feedback / feedback response', () => {
cy.loginLecturer()

cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()
cy.get(`[data-cy="session-cockpit-${sessionName2}"]`).click()
cy.wait(1000)
cy.get('[data-cy="next-block-timeline"]').click()
Expand All @@ -788,15 +788,15 @@ describe('Different live-quiz workflows', () => {
it('End session on lecturer cockpit', () => {
cy.loginLecturer()

cy.get('[data-cy="sessions"]').click()
cy.get('[data-cy="quizzes"]').click()
cy.get(`[data-cy="session-cockpit-${sessionName2}"]`).click()
cy.wait(1000)
cy.get('[data-cy="next-block-timeline"]').click()
})

it('Cleanup: Delete the live quiz used for the full cycle test', () => {
cy.loginLecturer()
cy.get(`[data-cy="sessions"]`).click()
cy.get(`[data-cy="quizzes"]`).click()

cy.findByText(sessionName2).should('exist')
cy.get(`[data-cy="delete-live-quiz-${sessionName2}"]`).click()
Expand Down
1 change: 1 addition & 0 deletions packages/markdown/src/public/components.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

86 changes: 42 additions & 44 deletions packages/markdown/src/public/utilities.css
Original file line number Diff line number Diff line change
@@ -1,191 +1,189 @@
.absolute {
position: absolute;
position: absolute
}

.relative {
position: relative;
position: relative
}

.right-2 {
right: 0.5rem;
right: 0.5rem
}

.top-2 {
top: 0.5rem;
top: 0.5rem
}

.my-1 {
margin-top: 0.25rem;
margin-bottom: 0.25rem;
margin-bottom: 0.25rem
}

.mb-1 {
margin-bottom: 0.25rem;
margin-bottom: 0.25rem
}

.line-clamp-1 {
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
-webkit-line-clamp: 1
}

.line-clamp-2 {
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
-webkit-line-clamp: 2
}

.line-clamp-3 {
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
-webkit-line-clamp: 3
}

.flex {
display: flex;
display: flex
}

.h-full {
height: 100%;
height: 100%
}

.max-h-16 {
max-height: 4rem;
max-height: 4rem
}

.max-h-36 {
max-height: 9rem;
max-height: 9rem
}

.max-h-64 {
max-height: 16rem;
max-height: 16rem
}

.min-h-36 {
min-height: 9rem;
min-height: 9rem
}

.w-auto {
width: auto;
width: auto
}

.w-full {
width: 100%;
width: 100%
}

.max-w-\[50\%\] {
max-width: 50%;
max-width: 50%
}

.max-w-full {
max-width: 100%;
max-width: 100%
}

.max-w-md {
max-width: 28rem;
max-width: 28rem
}

.max-w-none {
max-width: none;
max-width: none
}

.flex-initial {
flex: 0 1 auto;
flex: 0 1 auto
}

.flex-row {
flex-direction: row;
flex-direction: row
}

.flex-col {
flex-direction: column;
flex-direction: column
}

.items-start {
align-items: flex-start;
align-items: flex-start
}

.gap-3 {
gap: 0.75rem;
gap: 0.75rem
}

.rounded {
border-radius: 0.25rem;
border-radius: 0.25rem
}

.border {
border-width: 1px;
border-width: 1px
}

.bg-white {
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
background-color: rgb(255 255 255 / var(--tw-bg-opacity))
}

.object-contain {
-o-object-fit: contain;
object-fit: contain;
object-fit: contain
}

.px-4 {
padding-left: 1rem;
padding-right: 1rem;
padding-right: 1rem
}

.py-3 {
padding-top: 0.75rem;
padding-bottom: 0.75rem;
padding-bottom: 0.75rem
}

.text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
line-height: 1.25rem
}

.leading-6 {
line-height: 1.5rem;
line-height: 1.5rem
}

.text-black {
--tw-text-opacity: 1;
color: rgb(0 0 0 / var(--tw-text-opacity));
color: rgb(0 0 0 / var(--tw-text-opacity))
}

.text-slate-600 {
--tw-text-opacity: 1;
color: rgb(71 85 105 / var(--tw-text-opacity));
color: rgb(71 85 105 / var(--tw-text-opacity))
}

.shadow {
--tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
--tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color),
0 1px 2px -1px var(--tw-shadow-color);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000),
var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
--tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
}

@media (hover: hover) and (pointer: fine) {
.hover\:bg-slate-200:hover {
--tw-bg-opacity: 1;
background-color: rgb(226 232 240 / var(--tw-bg-opacity));
background-color: rgb(226 232 240 / var(--tw-bg-opacity))
}

.hover\:text-black:hover {
--tw-text-opacity: 1;
color: rgb(0 0 0 / var(--tw-text-opacity));
color: rgb(0 0 0 / var(--tw-text-opacity))
}

.hover\:text-white:hover {
--tw-text-opacity: 1;
color: rgb(255 255 255 / var(--tw-text-opacity));
color: rgb(255 255 255 / var(--tw-text-opacity))
}
}

@media (min-width: 768px) {
.md\:max-w-\[60\%\] {
max-width: 60%;
max-width: 60%
}
}
Loading