diff --git a/README_TOONTJEHOGER.md b/README_TOONTJEHOGER.md index 8d162ee54..47f8031b2 100644 --- a/README_TOONTJEHOGER.md +++ b/README_TOONTJEHOGER.md @@ -6,9 +6,9 @@ Set the following experiment values in the admin: | ---------- | ------------ | ------ | | home | toontjehoger | 0 | -## Experiments +## Experiment blocks -The ToontjeHoger experiment rules can be found in: +The ToontjeHoger experiment block rules can be found in: ``` backend/experiment/rules/toontjehoger_1_mozart.py @@ -19,13 +19,13 @@ backend/experiment/rules/toontjehoger_5_tempo.py backend/experiment/rules/toontjehoger_6_relative.py ``` -- These rules contain all textual content that is shown during the experiment +- These rules contain all textual content that is shown during the block -**Per experiment config** +**Per block config** -Set the following per-experiment values in the admin: +Set the following per-block values in the admin: -| Experiment | Slug | Rounds | +| Block | Slug | Rounds | | ---------- | ------------------------ | ------ | | 1 | toontjehoger_1_mozart | 2 | | 2 | toontjehoger_2_preverbal | 2 | @@ -34,7 +34,7 @@ Set the following per-experiment values in the admin: | 5 | toontjehoger_5_tempo | 5 | | 6 | toontjehoger_6_relative | 2 | -### Experiment images +### Block images Images for the ToontjeHoger experiments can be found in: @@ -42,7 +42,7 @@ Images for the ToontjeHoger experiments can be found in: frontend/public/images/experiments/toontjehoger/* ``` -### Experiment information pages +### Block information pages The information pages are shown after each experiment can be found in: @@ -57,9 +57,9 @@ backend/templates/info/toontjehoger/experiment6.html ## Playlists -Each experiment uses a playlist with additional information in the tag/group field. +Each block uses a playlist with additional information in the tag/group field. -### Experiment 1 +### Block 1 The group field contains the round. @@ -68,7 +68,7 @@ The group field contains the round. "Wolfgang Amadeus Mozart","Sonate voor twee pianos in D groot, KV 448 (uitgevoerd door Lucas en Arthur Jussen)",0,28.0,"/toontjehoger/mozart/fragment_b.mp3",0,0,2 ``` -### Experiment 2 +### Block 2 The group field contains the round. @@ -80,7 +80,7 @@ AML,Franse baby,0,1,/toontjehoger/preverbal/5_franse_baby.mp3,0,a,2 AML,Duitse baby,0,1,/toontjehoger/preverbal/4_duitse_baby.mp3,0,b,2 ``` -### Experiment 3 +### Block 3 The group field contains a semi-colon separated list of time-period and emotion, e.g. 70s;vrolijk @@ -112,7 +112,7 @@ David Bowie,Heroes,0,1,toontjehoger/plink/2021-024.mp3,0,0,70s;vrolijk Dire Straits,Sultans Of Swing,0,1,toontjehoger/plink/2021-025.mp3,0,0,70s;vrolijk ``` -### Experiment 4 +### Block 4 The tag field contains indicates if the section pitch is original (a) or it it changed (b,c). The group field contains a song identifier. @@ -159,7 +159,7 @@ AML,Breaking Bad,0,1,/toontjehoger/absolute/4_Toonhoogte_Item13_b.mp3,0,b,13 AML,Breaking Bad,0,1,/toontjehoger/absolute/4_Toonhoogte_Item13_c.mp3,0,c,13 ``` -### Experiment 5 +### Block 5 The tag field contains an identifier. The group field shows if it is an original (or) or changed (ch) track. @@ -226,7 +226,7 @@ The Stooges,Now I Wanna Be Your Dog,0,1,/toontjehoger/tempo/R5_P2_CH_155.mp3,0,R Iggy Pop,Now I Wanna Be Your Dog,0,1,/toontjehoger/tempo/R5_P2_OR_155.mp3,0,R5_P2_OR,or ``` -### Experiment 6 +### Block 6 The tag field indicates if the section in a, b or c. diff --git a/backend/experiment/actions/tests/test_action_utils.py b/backend/experiment/actions/tests/test_action_utils.py index 18d84c89d..8ab2f9173 100644 --- a/backend/experiment/actions/tests/test_action_utils.py +++ b/backend/experiment/actions/tests/test_action_utils.py @@ -19,9 +19,9 @@ def setUp(self) -> None: def test_collection_url(self): self.assertEqual(get_current_collection_url(self.session), None) self.session.save_json_data({COLLECTION_KEY: 'superdupercollection'}) - self.assertEqual(get_current_collection_url(self.session), '/collection/superdupercollection') + self.assertEqual(get_current_collection_url(self.session), '/superdupercollection') self.participant.participant_id_url = 'participant42' - self.assertEqual(get_current_collection_url(self.session), '/collection/superdupercollection?participant_id=participant42') + self.assertEqual(get_current_collection_url(self.session), '/superdupercollection?participant_id=participant42') def test_randomize_playhead(self): min_jitter = 5 diff --git a/backend/experiment/actions/utils.py b/backend/experiment/actions/utils.py index 652b50272..3fe14a035 100644 --- a/backend/experiment/actions/utils.py +++ b/backend/experiment/actions/utils.py @@ -18,9 +18,9 @@ def get_current_collection_url(session: Session) -> str: if session.participant.participant_id_url: participant_id_url = session.participant.participant_id_url - return f'/collection/{collection_slug}?participant_id={participant_id_url}' + return f'/{collection_slug}?participant_id={participant_id_url}' else: - return f'/collection/{collection_slug}' + return f'/{collection_slug}' def final_action_with_optional_button(session, final_text='', title=_('End'), button_text=_('Continue')): diff --git a/backend/experiment/admin.py b/backend/experiment/admin.py index 53ebe2277..cbdd2ead0 100644 --- a/backend/experiment/admin.py +++ b/backend/experiment/admin.py @@ -178,7 +178,7 @@ def block_name_link(self, obj): def block_slug_link(self, obj): dev_mode = settings.DEBUG is True - url = f"http://localhost:3000/{obj.slug}" if dev_mode else f"/{obj.slug}" + url = f"http://localhost:3000/block/{obj.slug}" if dev_mode else f"/block/{obj.slug}" return format_html( f'{obj.slug} ↗') @@ -225,7 +225,7 @@ class ExperimentCollectionAdmin( def slug_link(self, obj): dev_mode = settings.DEBUG is True - url = f"http://localhost:3000/collection/{obj.slug}" if dev_mode else f"/collection/{obj.slug}" + url = f"http://localhost:3000/{obj.slug}" if dev_mode else f"/{obj.slug}" return format_html( f'{obj.slug} ↗') diff --git a/backend/experiment/rules/tests/test_beat_alignment.py b/backend/experiment/rules/tests/test_beat_alignment.py index 9c44d39e7..b78fc3a7a 100644 --- a/backend/experiment/rules/tests/test_beat_alignment.py +++ b/backend/experiment/rules/tests/test_beat_alignment.py @@ -43,7 +43,7 @@ def load_json(self, response): return json.loads(response.content) def test_block(self): - response = self.client.get('/experiment/ba/') + response = self.client.get('/experiment/block/ba/') response_json = self.load_json(response) self.assertTrue({'id', 'slug', 'name', 'class_name', 'rounds', 'playlists', 'next_round', 'loading_text'} <= response_json.keys()) diff --git a/backend/experiment/tests/test_admin_experiment.py b/backend/experiment/tests/test_admin_experiment.py index 4e75717fa..f0c7364d7 100644 --- a/backend/experiment/tests/test_admin_experiment.py +++ b/backend/experiment/tests/test_admin_experiment.py @@ -27,7 +27,7 @@ class MockRequest: request = MockRequest() -class TestAdminExperiment(TestCase): +class TestAdminBlock(TestCase): @classmethod def setUpTestData(cls): @@ -82,6 +82,15 @@ def test_block_link(self): '{}', expected_url, expected_name) self.assertEqual(link, expected_link) + def test_block_slug_link(self): + block = Block.objects.create(name="Test Block", slug="test-block") + site = AdminSite() + admin = BlockAdmin(block, site) + link = admin.block_slug_link(block) + + expected_link = 'test-block ↗' + self.assertEqual(link, expected_link) + class TestAdminBlockExport(TestCase): diff --git a/backend/experiment/tests/test_views.py b/backend/experiment/tests/test_views.py index 7e10b934e..f9a2c0f8a 100644 --- a/backend/experiment/tests/test_views.py +++ b/backend/experiment/tests/test_views.py @@ -78,7 +78,7 @@ def test_get_experiment_collection(self): session['participant_id'] = self.participant.id session.save() # check that first_experiments is returned correctly - response = self.client.get('/experiment/collection/test_series/') + response = self.client.get('/experiment/test_series/') self.assertEqual(response.json().get( 'nextBlock').get('slug'), 'block1') # create session @@ -87,7 +87,7 @@ def test_get_experiment_collection(self): participant=self.participant, finished_at=timezone.now() ) - response = self.client.get('/experiment/collection/test_series/') + response = self.client.get('/experiment/test_series/') self.assertIn(response.json().get('nextBlock').get( 'slug'), ('block2', 'block3')) self.assertEqual(response.json().get('dashboard'), []) @@ -101,7 +101,7 @@ def test_get_experiment_collection(self): participant=self.participant, finished_at=timezone.now() ) - response = self.client.get('/experiment/collection/test_series/') + response = self.client.get('/experiment/test_series/') response_json = response.json() self.assertEqual(response_json.get( 'nextBlock').get('slug'), 'block4') @@ -117,7 +117,7 @@ def test_get_experiment_collection(self): def test_get_experiment_collection_not_found(self): # if ExperimentCollection does not exist, return 404 - response = self.client.get('/experiment/collection/not_found/') + response = self.client.get('/experiment/not_found/') self.assertEqual(response.status_code, 404) def test_get_experiment_collection_inactive(self): @@ -125,7 +125,7 @@ def test_get_experiment_collection_inactive(self): collection = ExperimentCollection.objects.get(slug='test_series') collection.active = False collection.save() - response = self.client.get('/experiment/collection/test_series/') + response = self.client.get('/experiment/test_series/') self.assertEqual(response.status_code, 404) def test_experiment_collection_with_dashboard(self): @@ -144,7 +144,7 @@ def test_experiment_collection_with_dashboard(self): intermediate_phase.dashboard = True intermediate_phase.save() # check that first_experiments is returned correctly - response = self.client.get('/experiment/collection/test_series/') + response = self.client.get('/experiment/test_series/') self.assertEqual(type(response.json().get('dashboard')), list) def test_experiment_collection_total_score(self): @@ -246,7 +246,7 @@ def test_get_block(self): Session(block=block, participant=participant, finished_at=timezone.now()) for index in range(3) ]) - response = self.client.get('/experiment/test-block/') + response = self.client.get('/experiment/block/test-block/') self.assertEqual( response.json()['slug'], 'test-block' diff --git a/backend/experiment/urls.py b/backend/experiment/urls.py index 0892c56fc..940c8aea8 100644 --- a/backend/experiment/urls.py +++ b/backend/experiment/urls.py @@ -9,9 +9,9 @@ # Experiment path('render_markdown/', render_markdown, name='render_markdown'), path('validate_playlist/', validate_block_playlist, name='validate_block_playlist'), - path('/', get_block, name='experiment'), - path('/feedback/', post_feedback, name='feedback'), - path('collection//', get_experiment_collection, + path('block//', get_block, name='block'), + path('block//feedback/', post_feedback, name='feedback'), + path('/', get_experiment_collection, name='experiment_collection'), # Robots.txt diff --git a/e2e/tests/e2e/test_beatalignment.py b/e2e/tests/e2e/test_beatalignment.py index 1674df486..2912b3e58 100644 --- a/e2e/tests/e2e/test_beatalignment.py +++ b/e2e/tests/e2e/test_beatalignment.py @@ -11,7 +11,7 @@ class TestBeatAlignment(BaseTest): def test_beatalignment(self): block_name = "beat_alignment" block_slug = self.config['block_slugs'][block_name] - self.driver.get(f"{self.base_url}/{block_slug}") + self.driver.get(f"{self.base_url}/block/{block_slug}") self.check_for_error(block_name, block_slug) diff --git a/e2e/tests/e2e/test_categorization.py b/e2e/tests/e2e/test_categorization.py index 41c62a059..efb041a71 100644 --- a/e2e/tests/e2e/test_categorization.py +++ b/e2e/tests/e2e/test_categorization.py @@ -18,7 +18,7 @@ def test_categorization(self): self.driver.delete_all_cookies() block_slug = self.config['block_slugs'][block_name] - self.driver.get(f"{self.base_url}/{block_slug}") + self.driver.get(f"{self.base_url}/block/{block_slug}") # if page body contains the word "Error", raise an exception self.check_for_error(block_name, block_slug) diff --git a/e2e/tests/e2e/test_eurovision.py b/e2e/tests/e2e/test_eurovision.py index d1549f392..4eb6ac9c7 100644 --- a/e2e/tests/e2e/test_eurovision.py +++ b/e2e/tests/e2e/test_eurovision.py @@ -17,7 +17,7 @@ def test_eurovision(self): try: block_slug = self.config['block_slugs'][block_name] - self.driver.get(f"{self.base_url}/{block_slug}") + self.driver.get(f"{self.base_url}/block/{block_slug}") # if page body contains the word "Error", raise an exception self.check_for_error(block_name, block_slug) diff --git a/e2e/tests/smoke/test_thkids.py b/e2e/tests/smoke/test_thkids.py index e382ada13..886e511e7 100644 --- a/e2e/tests/smoke/test_thkids.py +++ b/e2e/tests/smoke/test_thkids.py @@ -7,7 +7,7 @@ class TestTHKids(BaseTest): def test_th_kids(self): - self.driver.get(f"{self.base_url}/collection/thkids") + self.driver.get(f"{self.base_url}/thkids") dashboard = WebDriverWait(self.driver, 5).until(expected_conditions.presence_of_element_located((By.CLASS_NAME, "dashboard"))) print("\n✅ The frontend is working and the thkids collection page is working!") diff --git a/frontend/src/API.ts b/frontend/src/API.ts index 48c8519b4..134fee6e0 100644 --- a/frontend/src/API.ts +++ b/frontend/src/API.ts @@ -14,11 +14,11 @@ axios.defaults.withCredentials = true; // API endpoints export const URLS = { block: { - get: (slug: string) => "/experiment/" + slug + "/", - feedback: (slug: string) => "/experiment/" + slug + "/feedback/", + get: (slug: string) => "/experiment/block/" + slug + "/", + feedback: (slug: string) => "/experiment/block/" + slug + "/feedback/", }, experiment_collection: { - get: (slug: string) => `/experiment/collection/${slug}/` + get: (slug: string) => `/experiment/${slug}/` }, participant: { current: "/participant/", diff --git a/frontend/src/components/App/App.tsx b/frontend/src/components/App/App.tsx index afdda65bc..df228d456 100644 --- a/frontend/src/components/App/App.tsx +++ b/frontend/src/components/App/App.tsx @@ -69,7 +69,7 @@ const App = () => { {/* Default experiment */} @@ -80,12 +80,12 @@ const App = () => { - {/* Experiment Collection */} - - {/* Block */} + {/* Experiment */} + + {/* Store profile */} diff --git a/frontend/src/components/Block/Block.test.jsx b/frontend/src/components/Block/Block.test.jsx index 49c6a323a..d55000186 100644 --- a/frontend/src/components/Block/Block.test.jsx +++ b/frontend/src/components/Block/Block.test.jsx @@ -67,8 +67,8 @@ describe('Block Component', () => { const spy = vi.spyOn(API, 'getNextRound'); render( - - + + ); const button = await screen.findByText('Continue'); diff --git a/frontend/src/components/ExperimentCollection/ExperimentCollection.test.tsx b/frontend/src/components/ExperimentCollection/ExperimentCollection.test.tsx index 8d6a5fc82..5f6ceb2e7 100644 --- a/frontend/src/components/ExperimentCollection/ExperimentCollection.test.tsx +++ b/frontend/src/components/ExperimentCollection/ExperimentCollection.test.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { render, screen, waitFor } from '@testing-library/react'; +import { it, expect, describe } from 'vitest'; import MockAdapter from "axios-mock-adapter"; import axios from 'axios'; diff --git a/frontend/src/components/ExperimentCollection/ExperimentCollection.tsx b/frontend/src/components/ExperimentCollection/ExperimentCollection.tsx index eac1ab1fe..6f571ab3d 100644 --- a/frontend/src/components/ExperimentCollection/ExperimentCollection.tsx +++ b/frontend/src/components/ExperimentCollection/ExperimentCollection.tsx @@ -45,7 +45,7 @@ const ExperimentCollection = ({ match }: ExperimentCollectionProps) => { setHasShownConsent(true); } - const getExperimentHref = (slug: string) => `/${slug}${participantIdUrl ? `?participant_id=${participantIdUrl}` : ""}`; + const getBlockHref = (slug: string) => `/block/${slug}${participantIdUrl ? `?participant_id=${participantIdUrl}` : ""}`; if (loadingExperimentCollection) { return ( @@ -74,7 +74,7 @@ const ExperimentCollection = ({ match }: ExperimentCollectionProps) => { } if (!displayDashboard && nextBlock) { - return + return } return ( diff --git a/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.test.tsx b/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.test.tsx index 779e537f6..f237032a0 100644 --- a/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.test.tsx +++ b/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.test.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; import { BrowserRouter as Router } from 'react-router-dom'; +import { it, expect, describe } from 'vitest'; import ExperimentCollectionAbout from './ExperimentCollectionAbout'; @@ -29,6 +30,6 @@ describe('ExperimentCollectionAbout', () => { ) expect(screen.getByRole('link').innerHTML).toContain('Terug'); - expect(screen.getByRole('link').getAttribute('href')).toBe('/collection/some_slug'); + expect(screen.getByRole('link').getAttribute('href')).toBe('/some_slug'); }); -}) \ No newline at end of file +}) diff --git a/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.tsx b/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.tsx index 8e01b1ab1..a6c229406 100644 --- a/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.tsx +++ b/frontend/src/components/ExperimentCollection/ExperimentCollectionAbout/ExperimentCollectionAbout.tsx @@ -13,7 +13,7 @@ export const ExperimentCollectionAbout: React.FC return (
- + Terug @@ -24,4 +24,4 @@ export const ExperimentCollectionAbout: React.FC ); }; -export default ExperimentCollectionAbout; \ No newline at end of file +export default ExperimentCollectionAbout; diff --git a/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.test.tsx b/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.test.tsx index 0ba321263..a81456f4b 100644 --- a/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.test.tsx +++ b/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.test.tsx @@ -89,7 +89,7 @@ describe('ExperimentCollectionDashboard', () => { ); await waitFor(() => { expect(screen.getByRole('menu')).toBeTruthy(); - expect(screen.getByRole('menu').querySelector('a').getAttribute('href')).toBe('/some_slug'); + expect(screen.getByRole('menu').querySelector('a').getAttribute('href')).toBe('/block/some_slug'); }); }); @@ -101,7 +101,7 @@ describe('ExperimentCollectionDashboard', () => { ); await waitFor(() => { expect(screen.getByRole('menu')).toBeTruthy(); - expect(screen.getByRole('menu').querySelector('a').getAttribute('href')).toBe('/some_slug?participant_id=some_id'); + expect(screen.getByRole('menu').querySelector('a').getAttribute('href')).toBe('/block/some_slug?participant_id=some_id'); }); }); diff --git a/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.tsx b/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.tsx index dfb572d93..1738ba0a1 100644 --- a/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.tsx +++ b/frontend/src/components/ExperimentCollection/ExperimentCollectionDashboard/ExperimentCollectionDashboard.tsx @@ -23,7 +23,7 @@ export const ExperimentCollectionDashboard: React.FC `/${slug}${participantIdUrl ? `?participant_id=${participantIdUrl}` : ""}`; + const getExperimentHref = (slug: string) => `/block/${slug}${participantIdUrl ? `?participant_id=${participantIdUrl}` : ""}`; return (
diff --git a/frontend/src/components/ExperimentCollection/Header/Header.tsx b/frontend/src/components/ExperimentCollection/Header/Header.tsx index 4c6a40297..900a9dfee 100644 --- a/frontend/src/components/ExperimentCollection/Header/Header.tsx +++ b/frontend/src/components/ExperimentCollection/Header/Header.tsx @@ -45,8 +45,8 @@ export const Header: React.FC = ({
{scoreDisplayConfig && totalScore !== 0 && ( diff --git a/frontend/src/components/Question/Question.test.tsx b/frontend/src/components/Question/Question.test.tsx index 60cd9ef81..a5381bac6 100644 --- a/frontend/src/components/Question/Question.test.tsx +++ b/frontend/src/components/Question/Question.test.tsx @@ -61,32 +61,6 @@ describe('Question Component', () => { expect(mockOnChange).toHaveBeenCalledWith('New Value', 'test-question'); }); - it('renders different question views based on the view prop', () => { - const views = [ - QuestionViews.BUTTON_ARRAY, - QuestionViews.CHECKBOXES, - QuestionViews.DROPDOWN, - QuestionViews.AUTOCOMPLETE, - QuestionViews.RADIOS, - QuestionViews.RANGE, - QuestionViews.TEXT_RANGE, - QuestionViews.ICON_RANGE, - QuestionViews.STRING, - ]; - - views.forEach((view) => { - const props = { - ...defaultProps, - question: { - ...defaultProps.question, - view, - }, - }; - const { container } = render(); - expect(container.firstChild).toMatchSnapshot(); - }); - }); - it('applies emphasizeTitle class when emphasizeTitle prop is true', () => { const { container } = render(); expect(container.querySelector('.title')).toBeTruthy(); diff --git a/frontend/src/config.ts b/frontend/src/config.ts index b66ac6241..71322e29e 100644 --- a/frontend/src/config.ts +++ b/frontend/src/config.ts @@ -28,9 +28,9 @@ export const URLS = { about: "/about", profile: "/profile", storeProfile: "/profile/store", - block: "/:slug", - experimentCollectionAbout: "/collection/:slug/about", - experimentCollection: "/collection/:slug", + block: "/block/:slug", + experimentCollectionAbout: "/:slug/about", + experimentCollection: "/:slug", internalRedirect: "/redirect/:path", reloadParticipant: "/participant/reload/:id/:hash", theme: "/theme/:id", diff --git a/frontend/src/stories/Header.stories.tsx b/frontend/src/stories/Header.stories.tsx index 37b54b517..2d8ba7fee 100644 --- a/frontend/src/stories/Header.stories.tsx +++ b/frontend/src/stories/Header.stories.tsx @@ -15,7 +15,7 @@ function getHeaderData(overrides = {}) { description: "

Experiment ABC

This is the experiment description

", nextBlockSlug: '/th1-mozart', nextBlockButtonText: 'Volgende experiment', - collectionSlug: '/collection/thkids', + collectionSlug: '/thkids', aboutButtonText: 'Over ons', totalScore: 420, scoreDisplayConfig: {