test
{% endblocktranslate %}', content_type='text/html') @@ -34,16 +34,16 @@ def test_html_rendering(self): self.assertEqual(consent.text, 'test
') diff --git a/backend/experiment/actions/tests/test_actions_score.py b/backend/experiment/actions/tests/test_actions_score.py index f37d76d1c..7c5e3b400 100644 --- a/backend/experiment/actions/tests/test_actions_score.py +++ b/backend/experiment/actions/tests/test_actions_score.py @@ -12,7 +12,7 @@ def setUp(self): self.mock_session.last_song.return_value = "Test Song" self.mock_session.total_score.return_value = 50 self.mock_session.rounds_passed.return_value = 2 - self.mock_session.experiment.rounds = 5 + self.mock_session.block.rounds = 5 def test_initialization_full_parameters(self): score = Score( diff --git a/backend/experiment/actions/tests/test_wrappers.py b/backend/experiment/actions/tests/test_wrappers.py index ccc1ed382..d635e77d7 100644 --- a/backend/experiment/actions/tests/test_wrappers.py +++ b/backend/experiment/actions/tests/test_wrappers.py @@ -3,7 +3,7 @@ from experiment.actions import Trial from experiment.actions.wrappers import song_sync -from experiment.models import Experiment +from experiment.models import Block from participant.models import Participant from section.models import Playlist, Section from session.models import Session @@ -15,9 +15,9 @@ def setUp(self): self.participant = Participant.objects.create() self.section = Section.objects.create( filename='some/audio/file.mp3', playlist=self.playlist) - self.experiment = Experiment.objects.create(name='TestExperiment') + self.block = Block.objects.create(name='TestBlock') self.session = Session.objects.create( - experiment=self.experiment, participant=self.participant, playlist=self.playlist) + block=self.block, participant=self.participant, playlist=self.playlist) def test_song_sync(self): actions = song_sync(self.session, self.section, 'HookedTest') diff --git a/backend/experiment/actions/toontjehoger.py b/backend/experiment/actions/toontjehoger.py index f19f14327..9e733a0d9 100644 --- a/backend/experiment/actions/toontjehoger.py +++ b/backend/experiment/actions/toontjehoger.py @@ -10,7 +10,7 @@ class ToontjeHoger(BaseAction): # pylint: disable=too-few-public-methods ID = "TOONTJEHOGER" - def __init__(self, config, experiments=[]): + def __init__(self, config, blocks=[]): """ ToontjeHoger shows the ToontjeHoger homepage @@ -21,7 +21,7 @@ def __init__(self, config, experiments=[]): - main_button_url - score_label - supporters_intro - experiments: A list of ExperimentData objects + blocks: A list of ExperimentData objects """ self.config = config - self.experiments = [vars(i) for i in self.experiments] + self.blocks = [vars(i) for i in self.blocks] diff --git a/backend/experiment/actions/trial.py b/backend/experiment/actions/trial.py index f4108ae83..5e6b27627 100644 --- a/backend/experiment/actions/trial.py +++ b/backend/experiment/actions/trial.py @@ -66,7 +66,7 @@ def __init__( def action(self): """ - Serialize data for experiment action + Serialize data for a block action """ # Create action diff --git a/backend/experiment/actions/utils.py b/backend/experiment/actions/utils.py index b1994cc97..5a82c6921 100644 --- a/backend/experiment/actions/utils.py +++ b/backend/experiment/actions/utils.py @@ -11,8 +11,8 @@ def final_action_with_optional_button(session, final_text='', title=_('End'), button_text=_('Continue')): - """ given a session, a score message and an optional session dictionary from an experiment series, - return a Final.action, which has a button to continue to the next experiment if series is defined + """ given a session, a score message and an optional session dictionary from an experiment collection, + return a Final.action, which has a button to continue to the next block if series is defined """ collection_slug = session.load_json_data().get(COLLECTION_KEY) @@ -49,7 +49,7 @@ def render_feedback_trivia(feedback, trivia): def get_average_difference(session, num_turnpoints, initial_value): - """ + """ return the average difference in milliseconds participants could hear """ last_turnpoints = get_last_n_turnpoints(session, num_turnpoints) @@ -58,8 +58,8 @@ def get_average_difference(session, num_turnpoints, initial_value): if last_result: return float(last_result.section.song.name) else: - # this cannot happen in DurationDiscrimination style experiments - # for future compatibility, still catch the condition that there may be no results + # this cannot happen in DurationDiscrimination style blocks + # for future compatibility, still catch the condition that there may be no results return initial_value return (sum([int(result.section.song.name) for result in last_turnpoints]) / last_turnpoints.count()) @@ -78,7 +78,7 @@ def get_average_difference_level_based(session, num_turnpoints, initial_value): # no results right after the practice rounds return initial_value # Difference by level starts at initial value (which is level 1, so 20/(2^0)) and then halves for every next level - return sum([initial_value / (2 ** (int(result.section.song.name.split('_')[-1]) - 1)) for result in last_turnpoints]) / last_turnpoints.count() + return sum([initial_value / (2 ** (int(result.section.song.name.split('_')[-1]) - 1)) for result in last_turnpoints]) / last_turnpoints.count() def get_fallback_result(session): diff --git a/backend/experiment/admin.py b/backend/experiment/admin.py index 215b4090e..53ebe2277 100644 --- a/backend/experiment/admin.py +++ b/backend/experiment/admin.py @@ -26,7 +26,7 @@ from question.admin import QuestionSeriesInline from experiment.forms import ( ExperimentCollectionForm, - ExperimentForm, + BlockForm, ExportForm, TemplateForm, SocialMediaConfigForm, @@ -46,9 +46,9 @@ class FeedbackInline(admin.TabularInline): extra = 0 -class ExperimentAdmin(InlineActionsModelAdminMixin, admin.ModelAdmin): - list_display = ('image_preview', 'experiment_name_link', - 'experiment_slug_link', 'rules', +class BlockAdmin(InlineActionsModelAdminMixin, admin.ModelAdmin): + list_display = ('image_preview', 'block_name_link', + 'block_slug_link', 'rules', 'rounds', 'playlist_count', 'session_count', 'active') list_filter = ['active'] @@ -60,7 +60,7 @@ class ExperimentAdmin(InlineActionsModelAdminMixin, admin.ModelAdmin): 'rounds', 'bonus_points', 'playlists', 'consent'] inlines = [QuestionSeriesInline, FeedbackInline] - form = ExperimentForm + form = BlockForm # make playlists fields a list of checkboxes formfield_overrides = { @@ -68,7 +68,7 @@ class ExperimentAdmin(InlineActionsModelAdminMixin, admin.ModelAdmin): } def export(self, request, obj, parent_obj=None): - """Export experiment JSON data as zip archive, force download""" + """Export block JSON data as zip archive, force download""" # Init empty querysets all_results = Result.objects.none() @@ -112,7 +112,7 @@ def export(self, request, obj, parent_obj=None): export.short_description = "Export JSON" def export_csv(self, request, obj, parent_obj=None): - """Export experiment data in CSV, force download""" + """Export block data in CSV, force download""" # Handle export command from intermediate form if '_export' in request.POST: session_keys = [] @@ -130,16 +130,16 @@ def export_csv(self, request, obj, parent_obj=None): response['Content-Disposition'] = 'attachment; filename="{}.csv"'.format( obj.slug) # Get filtered data - experiment_table, fieldnames = obj.export_table( + block_table, fieldnames = obj.export_table( session_keys, result_keys, export_options) fieldnames.sort() writer = csv.DictWriter(response, fieldnames) writer.writeheader() - writer.writerows(experiment_table) + writer.writerows(block_table) return response - # Go back to admin experiment overview + # Go back to admin block overview if '_back' in request.POST: - return redirect('/admin/experiment/experiment') + return redirect('/admin/experiment/block') # Load a template in the export form if '_template' in request.POST: selected_template = request.POST.get('select_template') @@ -170,26 +170,26 @@ def image_preview(self, obj): return mark_safe(f'+ @@ -89,19 +89,19 @@
- + {{ exp.name }} -
+
{% for participant in exp.participants %}
-
+
{% if participant.participant_id_url %}
{{ participant.participant_id_url }}
@@ -132,20 +132,20 @@ Experiments in collection: {{ collection.name }}
{% endif %}
,
{% endfor %}
-
* Click to edit in a new window
diff --git a/backend/experiment/tests/test_admin_experiment.py b/backend/experiment/tests/test_admin_experiment.py index 7c7ffdad3..4e75717fa 100644 --- a/backend/experiment/tests/test_admin_experiment.py +++ b/backend/experiment/tests/test_admin_experiment.py @@ -6,15 +6,15 @@ from django.contrib.admin.sites import AdminSite from django.urls import reverse from django.utils.html import format_html -from experiment.admin import ExperimentAdmin, ExperimentCollectionAdmin, PhaseAdmin -from experiment.models import Experiment, ExperimentCollection, Phase, GroupedBlock +from experiment.admin import BlockAdmin, ExperimentCollectionAdmin, PhaseAdmin +from experiment.models import Block, ExperimentCollection, Phase, GroupedBlock from participant.models import Participant from result.models import Result from session.models import Session # Expected field count per model -EXPECTED_EXPERIMENT_FIELDS = 15 +EXPECTED_BLOCK_FIELDS = 15 EXPECTED_SESSION_FIELDS = 9 EXPECTED_RESULT_FIELDS = 12 EXPECTED_PARTICIPANT_FIELDS = 5 @@ -31,13 +31,13 @@ class TestAdminExperiment(TestCase): @classmethod def setUpTestData(cls): - Experiment.objects.create( + Block.objects.create( name='test', slug='TEST' ) Participant.objects.create() Session.objects.create( - experiment=Experiment.objects.first(), + block=Block.objects.first(), participant=Participant.objects.first() ) Result.objects.create( @@ -45,14 +45,15 @@ def setUpTestData(cls): ) def setUp(self): - self.admin = ExperimentAdmin(model=Experiment, - admin_site=AdminSite - ) + self.admin = BlockAdmin( + model=Block, + admin_site=AdminSite, + ) - def test_experiment_model_fields(self): - experiment = model_to_dict(Experiment.objects.first()) - experiment_fields = [key for key in experiment] - self.assertEqual(len(experiment_fields), EXPECTED_EXPERIMENT_FIELDS) + def test_block_model_fields(self): + block = model_to_dict(Block.objects.first()) + block_fields = [key for key in block] + self.assertEqual(len(block_fields), EXPECTED_BLOCK_FIELDS) def test_session_model_fields(self): session = model_to_dict(Session.objects.first()) @@ -69,31 +70,31 @@ def test_participant_model(self): participant_fields = [key for key in participant] self.assertEqual(len(participant_fields), EXPECTED_PARTICIPANT_FIELDS) - def test_experiment_link(self): - experiment = Experiment.objects.create(name="Test Experiment") + def test_block_link(self): + block = Block.objects.create(name="Test Block") site = AdminSite() - admin = ExperimentAdmin(experiment, site) - link = admin.experiment_name_link(experiment) + admin = BlockAdmin(block, site) + link = admin.block_name_link(block) expected_url = reverse( - "admin:experiment_experiment_change", args=[experiment.pk]) - expected_name = "Test Experiment" + "admin:experiment_block_change", args=[block.pk]) + expected_name = "Test Block" expected_link = format_html( '{}', expected_url, expected_name) self.assertEqual(link, expected_link) -class TestAdminExperimentExport(TestCase): +class TestAdminBlockExport(TestCase): fixtures = ['playlist', 'experiment'] @classmethod def setUpTestData(cls): cls.participant = Participant.objects.create(unique_hash=42) - cls.experiment = Experiment.objects.get(name='Hooked-China') - for playlist in cls.experiment.playlists.all(): + cls.block = Block.objects.get(name='Hooked-China') + for playlist in cls.block.playlists.all(): playlist.update_sections() cls.session = Session.objects.create( - experiment=cls.experiment, + block=cls.block, participant=cls.participant, ) for i in range(5): @@ -111,12 +112,13 @@ def setUpTestData(cls): def setUp(self): self.client = Client() - self.admin = ExperimentAdmin(model=Experiment, - admin_site=AdminSite - ) + self.admin = BlockAdmin( + model=Block, + admin_site=AdminSite + ) def test_admin_export(self): - response = self.admin.export(request, self.experiment) + response = self.admin.export(request, self.block) zip_buffer = BytesIO(response.content) with ZipFile(zip_buffer, 'r') as test_zip: # Test files inside zip @@ -145,7 +147,7 @@ def test_admin_export(self): these_sessions = json.loads(test_zip.read('sessions.json').decode("utf-8")) self.assertEqual(len(these_sessions), 1) - self.assertEqual(these_sessions[0]['fields']['experiment'], 14) + self.assertEqual(these_sessions[0]['fields']['block'], 14) these_songs = json.loads(test_zip.read('songs.json').decode("utf-8")) self.assertEqual(len(these_songs), 100) @@ -160,7 +162,7 @@ def test_export_table_includes_question_key(self): export_options = ['convert_result_json'] # Adjust based on your needs # Call the method under test - rows, fieldnames = self.experiment.export_table(session_keys, result_keys, export_options) + rows, fieldnames = self.block.export_table(session_keys, result_keys, export_options) # Assert that 'question_key' is in the fieldnames and check its value in rows self.assertIn('question_key', fieldnames) @@ -232,27 +234,27 @@ def test_related_series_with_series(self): expected_related_series = format_html('{}', expected_url, series.name) self.assertEqual(related_series, expected_related_series) - def test_experiments_with_no_experiments(self): + def test_blocks_with_no_blocks(self): series = ExperimentCollection.objects.create(name='Test Series') phase = Phase.objects.create( name='Test Group', index=1, randomize=False, dashboard=True, series=series) - experiments = self.admin.experiments(phase) - self.assertEqual(experiments, "No experiments") + blocks = self.admin.blocks(phase) + self.assertEqual(blocks, "No blocks") - def test_experiments_with_experiments(self): + def test_blocks_with_blocks(self): series = ExperimentCollection.objects.create(name='Test Series') phase = Phase.objects.create( name='Test Group', index=1, randomize=False, dashboard=True, series=series) - experiment1 = Experiment.objects.create(name='Experiment 1', slug='experiment-1') - experiment2 = Experiment.objects.create(name='Experiment 2', slug='experiment-2') - grouped_experiment1 = GroupedBlock.objects.create(phase=phase, experiment=experiment1) - grouped_experiment2 = GroupedBlock.objects.create(phase=phase, experiment=experiment2) + block1 = Block.objects.create(name='Block 1', slug='block-1') + block2 = Block.objects.create(name='Block 2', slug='block-2') + grouped_block1 = GroupedBlock.objects.create(phase=phase, block=block1) + grouped_block2 = GroupedBlock.objects.create(phase=phase, block=block2) - experiments = self.admin.experiments(phase) - expected_experiments = format_html( + blocks = self.admin.blocks(phase) + expected_blocks = format_html( ', '.join([ - f'{experiment.experiment.name}' - for experiment in [grouped_experiment1, grouped_experiment2] + f'{block.block.name}' + for block in [grouped_block1, grouped_block2] ]) ) - self.assertEqual(experiments, expected_experiments) + self.assertEqual(blocks, expected_blocks) diff --git a/backend/experiment/tests/test_forms.py b/backend/experiment/tests/test_forms.py index babe045f6..b306c4fac 100644 --- a/backend/experiment/tests/test_forms.py +++ b/backend/experiment/tests/test_forms.py @@ -1,11 +1,11 @@ from django.test import TestCase -from experiment.forms import ExperimentForm, ExportForm, TemplateForm, BLOCK_RULES, SESSION_CHOICES, RESULT_CHOICES, EXPORT_OPTIONS, TEMPLATE_CHOICES +from experiment.forms import BlockForm, ExportForm, TemplateForm, BLOCK_RULES, SESSION_CHOICES, RESULT_CHOICES, EXPORT_OPTIONS, TEMPLATE_CHOICES -class ExperimentFormTest(TestCase): +class BlockFormTest(TestCase): def test_form_fields(self): - form = ExperimentForm() + form = BlockForm() self.assertIn('name', form.fields) self.assertIn('slug', form.fields) self.assertIn('active', form.fields) @@ -15,7 +15,7 @@ def test_form_fields(self): self.assertIn('playlists', form.fields) def test_rules_field_choices(self): - form = ExperimentForm() + form = BlockForm() expected_choices = [(i, BLOCK_RULES[i].__name__) for i in BLOCK_RULES] expected_choices.append(("", "---------")) self.assertEqual(form.fields['rules'].choices, sorted(expected_choices)) diff --git a/backend/experiment/tests/test_model.py b/backend/experiment/tests/test_model.py index 609105119..d4f67a9c6 100644 --- a/backend/experiment/tests/test_model.py +++ b/backend/experiment/tests/test_model.py @@ -2,13 +2,13 @@ from image.models import Image from theme.models import ThemeConfig -from experiment.models import Experiment, ExperimentCollection +from experiment.models import Block, ExperimentCollection from participant.models import Participant from session.models import Session from result.models import Result -class ExperimentModelTest(TestCase): +class BlockModelTest(TestCase): @classmethod def setUpTestData(cls): logo_image = Image.objects.create( @@ -25,11 +25,11 @@ def setUpTestData(cls): logo_image=logo_image, background_image=background_image, ) - Experiment.objects.create( - name='Test Experiment', - description='Test experiment description', - slug='test-experiment', - url='https://example.com/experiment', + Block.objects.create( + name='Test Block', + description='Test block description', + slug='test-block', + url='https://example.com/block', hashtag='test', rounds=5, bonus_points=10, @@ -38,40 +38,40 @@ def setUpTestData(cls): theme_config=ThemeConfig.objects.get(name='Default'), ) - def test_experiment_str(self): - experiment = Experiment.objects.get(name='Test Experiment') - self.assertEqual(str(experiment), 'Test Experiment') + def test_block_str(self): + block = Block.objects.get(name='Test Block') + self.assertEqual(str(block), 'Test Block') - def test_experiment_session_count(self): - experiment = Experiment.objects.get(name='Test Experiment') - self.assertEqual(experiment.session_count(), 0) + def test_block_session_count(self): + block = Block.objects.get(name='Test Block') + self.assertEqual(block.session_count(), 0) - def test_experiment_playlist_count(self): - experiment = Experiment.objects.get(name='Test Experiment') - self.assertEqual(experiment.playlist_count(), 0) + def test_block_playlist_count(self): + block = Block.objects.get(name='Test Block') + self.assertEqual(block.playlist_count(), 0) - def test_experiment_current_participants(self): - experiment = Experiment.objects.get(name='Test Experiment') - participants = experiment.current_participants() + def test_block_current_participants(self): + block = Block.objects.get(name='Test Block') + participants = block.current_participants() self.assertEqual(len(participants), 0) - def test_experiment_export_admin(self): - experiment = Experiment.objects.get(name='Test Experiment') - exported_data = experiment.export_admin() - self.assertEqual(exported_data['experiment']['name'], 'Test Experiment') + def test_block_export_admin(self): + block = Block.objects.get(name='Test Block') + exported_data = block.export_admin() + self.assertEqual(exported_data['block']['name'], 'Test Block') - def test_experiment_export_sessions(self): - experiment = Experiment.objects.get(name='Test Experiment') - sessions = experiment.export_sessions() + def test_block_export_sessions(self): + block = Block.objects.get(name='Test Block') + sessions = block.export_sessions() self.assertEqual(len(sessions), 0) - def test_experiment_export_table(self): - experiment = Experiment.objects.get(name='Test Experiment') + def test_block_export_table(self): + block = Block.objects.get(name='Test Block') amount_of_sessions = 3 for i in range(amount_of_sessions): session = Session.objects.create( - experiment=experiment, + block=block, participant=Participant.objects.create() ) Result.objects.create( @@ -81,10 +81,10 @@ def test_experiment_export_table(self): question_key='test_question_1', ) - session_keys = ['experiment_id', 'experiment_name'] + session_keys = ['block_id', 'block_name'] result_keys = ['section_name', 'result_created_at'] export_options = {'wide_format': True} - rows, fieldnames = experiment.export_table( + rows, fieldnames = block.export_table( session_keys, result_keys, export_options @@ -93,19 +93,19 @@ def test_experiment_export_table(self): self.assertEqual(len(rows), amount_of_sessions) self.assertEqual(len(fieldnames), len(session_keys) + len(result_keys)) - def test_experiment_get_rules(self): - experiment = Experiment.objects.get(name='Test Experiment') - rules = experiment.get_rules() + def test_block_get_rules(self): + block = Block.objects.get(name='Test Block') + rules = block.get_rules() self.assertIsNotNone(rules) - def test_experiment_max_score(self): - experiment = Experiment.objects.get(name='Test Experiment') + def test_block_max_score(self): + block = Block.objects.get(name='Test Block') amount_of_results = 3 question_score = 1 session = Session.objects.create( - experiment=experiment, + block=block, participant=Participant.objects.create() ) for j in range(amount_of_results): @@ -120,8 +120,8 @@ def test_experiment_max_score(self): session.save() question_scores = amount_of_results * question_score - bonus_points = experiment.bonus_points - max_score = experiment.max_score() + bonus_points = block.bonus_points + max_score = block.max_score() self.assertEqual(max_score, question_scores + bonus_points) self.assertEqual(max_score, 13.0) diff --git a/backend/experiment/tests/test_model_functions.py b/backend/experiment/tests/test_model_functions.py index 961b38410..e42ae6a59 100644 --- a/backend/experiment/tests/test_model_functions.py +++ b/backend/experiment/tests/test_model_functions.py @@ -1,17 +1,17 @@ from django.test import TestCase from session.models import Session from participant.models import Participant -from experiment.models import Experiment, ExperimentCollection, Phase, GroupedBlock +from experiment.models import Block, ExperimentCollection, Phase, GroupedBlock class TestModelExperiment(TestCase): @classmethod def setUpTestData(cls): - cls.experiment = Experiment.objects.create(rules='THATS_MY_SONG', slug='hooked', rounds=42) + cls.block = Block.objects.create(rules='THATS_MY_SONG', slug='hooked', rounds=42) def test_separate_rules_instance(self): - rules1 = self.experiment.get_rules() - rules2 = self.experiment.get_rules() + rules1 = self.block.get_rules() + rules2 = self.block.get_rules() keys1 = rules1.question_series[0]['keys'] + rules1.question_series[1]['keys'] keys2 = rules2.question_series[0]['keys'] + rules2.question_series[1]['keys'] assert keys1 == keys2 @@ -31,39 +31,39 @@ def test_verbose_name_plural(self): # Check if verbose_name_plural is correctly set self.assertEqual(meta.verbose_name_plural, "Experiment Collections") - def test_associated_experiments(self): + def test_associated_blocks(self): collection = self.collection phase1 = Phase.objects.create( name='first_phase', series=collection) phase2 = Phase.objects.create( name='second_phase', series=collection) - experiment = Experiment.objects.create( + block = Block.objects.create( rules='THATS_MY_SONG', slug='hooked', rounds=42) - experiment2 = Experiment.objects.create( + block2 = Block.objects.create( rules='THATS_MY_SONG', slug='unhinged', rounds=42) - experiment3 = Experiment.objects.create( + block3 = Block.objects.create( rules='THATS_MY_SONG', slug='derailed', rounds=42) GroupedBlock.objects.create( - experiment=experiment, phase=phase1) + block=block, phase=phase1) GroupedBlock.objects.create( - experiment=experiment2, phase=phase2) + block=block2, phase=phase2) GroupedBlock.objects.create( - experiment=experiment3, phase=phase2) - self.assertEqual(collection.associated_experiments(), [ - experiment, experiment2, experiment3]) + block=block3, phase=phase2) + self.assertEqual(collection.associated_blocks(), [ + block, block2, block3]) def test_export_sessions(self): collection = self.collection phase = Phase.objects.create( name='test', series=collection) - experiment = Experiment.objects.create( + block = Block.objects.create( rules='THATS_MY_SONG', slug='hooked', rounds=42) GroupedBlock.objects.create( - experiment=experiment, phase=phase) + block=block, phase=phase) Session.objects.bulk_create( - [Session(experiment=experiment, participant=self.participant1), - Session(experiment=experiment, participant=self.participant2), - Session(experiment=experiment, participant=self.participant3)] + [Session(block=block, participant=self.participant1), + Session(block=block, participant=self.participant2), + Session(block=block, participant=self.participant3)] ) sessions = collection.export_sessions() self.assertEqual(len(sessions), 3) @@ -72,14 +72,14 @@ def test_current_participants(self): collection = self.collection phase = Phase.objects.create( name='test', series=collection) - experiment = Experiment.objects.create( + block = Block.objects.create( rules='THATS_MY_SONG', slug='hooked', rounds=42) GroupedBlock.objects.create( - experiment=experiment, phase=phase) + block=block, phase=phase) Session.objects.bulk_create( - [Session(experiment=experiment, participant=self.participant1), - Session(experiment=experiment, participant=self.participant2), - Session(experiment=experiment, participant=self.participant3)] + [Session(block=block, participant=self.participant1), + Session(block=block, participant=self.participant2), + Session(block=block, participant=self.participant3)] ) participants = collection.current_participants() self.assertEqual(len(participants), 3) diff --git a/backend/experiment/tests/test_validators.py b/backend/experiment/tests/test_validators.py index b532d34d7..8189bb984 100644 --- a/backend/experiment/tests/test_validators.py +++ b/backend/experiment/tests/test_validators.py @@ -1,7 +1,7 @@ from django.core.exceptions import ValidationError from django.test import TestCase -from experiment.validators import experiment_slug_validator +from experiment.validators import block_slug_validator class ExperimentValidatorsTest(TestCase): @@ -9,7 +9,7 @@ def test_valid_slug(self): # Test a valid lowercase slug slug = 'testslug' try: - experiment_slug_validator(slug) + block_slug_validator(slug) except ValidationError: self.fail(f"Unexpected ValidationError raised for slug: {slug}") @@ -17,27 +17,27 @@ def test_disallowed_slug(self): # Test a disallowed slug slug = 'admin' with self.assertRaises(ValidationError) as cm: - experiment_slug_validator(slug) + block_slug_validator(slug) self.assertEqual(str(cm.exception.messages[0]), 'The slug cannot start with "admin".') def test_uppercase_slug(self): # Test an uppercase slug slug = 'TestSlug' with self.assertRaises(ValidationError) as cm: - experiment_slug_validator(slug) + block_slug_validator(slug) self.assertEqual(str(cm.exception.messages[0]), 'Slugs must be lowercase.') def test_disallowed_prefix(self): # Test a disallowed prefix slug = 'admin-test' with self.assertRaises(ValidationError) as cm: - experiment_slug_validator(slug) + block_slug_validator(slug) self.assertEqual(str(cm.exception.messages[0]), 'The slug cannot start with "admin".') def test_valid_prefix(self): # Test a valid prefix slug = 'test-admin' try: - experiment_slug_validator(slug) + block_slug_validator(slug) except ValidationError: self.fail(f"Unexpected ValidationError raised for slug: {slug}") diff --git a/backend/experiment/tests/test_views.py b/backend/experiment/tests/test_views.py index 95f65279d..606a464b3 100644 --- a/backend/experiment/tests/test_views.py +++ b/backend/experiment/tests/test_views.py @@ -4,11 +4,11 @@ from image.models import Image from experiment.serializers import ( - serialize_experiment, + serialize_block, serialize_phase ) from experiment.models import ( - Experiment, + Block, ExperimentCollection, Phase, GroupedBlock, @@ -37,10 +37,10 @@ def setUpTestData(cls): series=collection, index=1 ) - cls.experiment1 = Experiment.objects.create( - name='experiment1', slug='experiment1') + cls.block1 = Block.objects.create( + name='block1', slug='block1') GroupedBlock.objects.create( - experiment=cls.experiment1, + block=cls.block1, phase=introductory_phase ) intermediate_phase = Phase.objects.create( @@ -48,16 +48,16 @@ def setUpTestData(cls): series=collection, index=2 ) - cls.experiment2 = Experiment.objects.create( - name='experiment2', slug='experiment2', theme_config=theme_config) - cls.experiment3 = Experiment.objects.create( - name='experiment3', slug='experiment3') + cls.block2 = Block.objects.create( + name='block2', slug='block2', theme_config=theme_config) + cls.block3 = Block.objects.create( + name='block3', slug='block3') GroupedBlock.objects.create( - experiment=cls.experiment2, + block=cls.block2, phase=intermediate_phase ) GroupedBlock.objects.create( - experiment=cls.experiment3, + block=cls.block3, phase=intermediate_phase ) final_phase = Phase.objects.create( @@ -65,10 +65,10 @@ def setUpTestData(cls): series=collection, index=3 ) - cls.experiment4 = Experiment.objects.create( - name='experiment4', slug='experiment4') + cls.block4 = Block.objects.create( + name='block4', slug='block4') GroupedBlock.objects.create( - experiment=cls.experiment4, + block=cls.block4, phase=final_phase ) @@ -80,31 +80,31 @@ def test_get_experiment_collection(self): # check that first_experiments is returned correctly response = self.client.get('/experiment/collection/test_series/') self.assertEqual(response.json().get( - 'nextExperiment').get('slug'), 'experiment1') + 'nextBlock').get('slug'), 'block1') # create session Session.objects.create( - experiment=self.experiment1, + block=self.block1, participant=self.participant, finished_at=timezone.now() ) response = self.client.get('/experiment/collection/test_series/') - self.assertIn(response.json().get('nextExperiment').get( - 'slug'), ('experiment2', 'experiment3')) + self.assertIn(response.json().get('nextBlock').get( + 'slug'), ('block2', 'block3')) self.assertEqual(response.json().get('dashboard'), []) Session.objects.create( - experiment=self.experiment2, + block=self.block2, participant=self.participant, finished_at=timezone.now() ) Session.objects.create( - experiment=self.experiment3, + block=self.block3, participant=self.participant, finished_at=timezone.now() ) response = self.client.get('/experiment/collection/test_series/') response_json = response.json() self.assertEqual(response_json.get( - 'nextExperiment').get('slug'), 'experiment4') + 'nextBlock').get('slug'), 'block4') self.assertEqual(response_json.get('dashboard'), []) self.assertEqual(response_json.get('theme').get('name'), 'test_theme') self.assertEqual(len(response_json['theme']['header']['score']), 3) @@ -129,12 +129,12 @@ def test_get_experiment_collection_inactive(self): self.assertEqual(response.status_code, 404) def test_experiment_collection_with_dashboard(self): - # if ExperimentCollection has dashboard set True, return list of random experiments + # if ExperimentCollection has dashboard set True, return list of random blocks session = self.client.session session['participant_id'] = self.participant.id session.save() Session.objects.create( - experiment=self.experiment1, + block=self.block1, participant=self.participant, finished_at=timezone.now() ) @@ -148,12 +148,12 @@ def test_experiment_collection_with_dashboard(self): self.assertEqual(type(response.json().get('dashboard')), list) def test_experiment_collection_total_score(self): - """ Test calculation of total score for grouped experiment on dashboard """ + """ Test calculation of total score for grouped block on dashboard """ session = self.client.session session['participant_id'] = self.participant.id session.save() Session.objects.create( - experiment=self.experiment2, + block=self.block2, participant=self.participant, finished_at=timezone.now(), final_score=8 @@ -167,7 +167,7 @@ def test_experiment_collection_total_score(self): total_score_1 = serialized_coll_1['totalScore'] self.assertEqual(total_score_1, 8) Session.objects.create( - experiment=self.experiment3, + block=self.block3, participant=self.participant, finished_at=timezone.now(), final_score=8 @@ -179,12 +179,12 @@ def test_experiment_collection_total_score(self): class ExperimentViewsTest(TestCase): - def test_serialize_experiment(self): - # Create an experiment - experiment = Experiment.objects.create( - slug='test-experiment', - name='Test Experiment', - description='This is a test experiment', + def test_serialize_block(self): + # Create an block + block = Block.objects.create( + slug='test-block', + name='Test Block', + description='This is a test block', image=Image.objects.create( title='Test', description='', @@ -198,24 +198,24 @@ def test_serialize_experiment(self): ) participant = Participant.objects.create() Session.objects.bulk_create([ - Session(experiment=experiment, participant=participant, finished_at=timezone.now()) for index in range(3) + Session(block=block, participant=participant, finished_at=timezone.now()) for index in range(3) ]) - # Call the serialize_experiment function - serialized_experiment = serialize_experiment(experiment, participant) + # Call the serialize_block function + serialized_block = serialize_block(block, participant) # Assert the serialized data self.assertEqual( - serialized_experiment['slug'], 'test-experiment' + serialized_block['slug'], 'test-block' ) self.assertEqual( - serialized_experiment['name'], 'Test Experiment' + serialized_block['name'], 'Test Block' ) self.assertEqual( - serialized_experiment['description'], 'This is a test experiment' + serialized_block['description'], 'This is a test block' ) self.assertEqual( - serialized_experiment['image'], { + serialized_block['image'], { 'title': 'Test', 'description': '', 'file': f'{settings.BASE_URL}/upload/test-image.jpg', @@ -227,12 +227,12 @@ def test_serialize_experiment(self): } ) - def test_get_experiment(self): - # Create an experiment - experiment = Experiment.objects.create( - slug='test-experiment', - name='Test Experiment', - description='This is a test experiment', + def test_get_block(self): + # Create an block + block = Block.objects.create( + slug='test-block', + name='Test Block', + description='This is a test block', image=Image.objects.create( file='test-image.jpg' ), @@ -241,16 +241,16 @@ def test_get_experiment(self): ) participant = Participant.objects.create() Session.objects.bulk_create([ - Session(experiment=experiment, participant=participant, finished_at=timezone.now()) for index in range(3) + Session(block=block, participant=participant, finished_at=timezone.now()) for index in range(3) ]) - response = self.client.get('/experiment/test-experiment/') + response = self.client.get('/experiment/test-block/') self.assertEqual( - response.json()['slug'], 'test-experiment' + response.json()['slug'], 'test-block' ) self.assertEqual( - response.json()['name'], 'Test Experiment' + response.json()['name'], 'Test Block' ) self.assertEqual( response.json()['theme']['name'], 'test_theme' diff --git a/backend/experiment/urls.py b/backend/experiment/urls.py index d6153b18e..0892c56fc 100644 --- a/backend/experiment/urls.py +++ b/backend/experiment/urls.py @@ -1,6 +1,6 @@ from django.urls import path from django.views.generic.base import TemplateView -from .views import get_experiment, get_experiment_collection, post_feedback, render_markdown, add_default_question_series, validate_experiment_playlist +from .views import get_block, get_experiment_collection, post_feedback, render_markdown, add_default_question_series, validate_block_playlist app_name = 'experiment' @@ -8,8 +8,8 @@ path('add_default_question_series/This is our consent form!
', dashboard: [blockWithAllProps], nextExperiment: block1 }); + mock.onGet().replyOnce(200, { consent: 'This is our consent form!
', dashboard: [blockWithAllProps], nextBlock: block1 }); render(This is the experiment description
", - nextExperimentSlug: '/th1-mozart', + nextBlockSlug: '/th1-mozart', nextBlockButtonText: 'Volgende experiment', collectionSlug: '/collection/thkids', aboutButtonText: 'Over ons', diff --git a/frontend/src/types/ExperimentCollection.ts b/frontend/src/types/ExperimentCollection.ts index 177320991..8eaf69a5e 100644 --- a/frontend/src/types/ExperimentCollection.ts +++ b/frontend/src/types/ExperimentCollection.ts @@ -21,7 +21,7 @@ export default interface ExperimentCollection { name: string; description: string; dashboard: Block[]; - nextExperiment: Block | null; + nextBlock: Block | null; aboutContent: string; consent?: Consent; theme?: Theme; diff --git a/frontend/src/types/Theme.ts b/frontend/src/types/Theme.ts index b5ae06413..aaedf662f 100644 --- a/frontend/src/types/Theme.ts +++ b/frontend/src/types/Theme.ts @@ -7,7 +7,7 @@ export interface ScoreDisplayConfig { } export interface Header { - nextExperimentButtonText: string; + nextBlockButtonText: string; aboutButtonText: string; score: ScoreDisplayConfig; };