` cannot be a
+ `` — but takes the same two-state logic. `shared/_empty_state` is
+ untouched: its root is a `
` with a 180px illustration, unusable inside a
+ `
`, and it has five other call sites.
+
+## Consequences
+
+- A filter miss can no longer assert that nothing exists. The regression guard
+ is the *negative* assertion in every no-matches test
+ (`assert_no_match 'No groups have been created yet.'`), which is the check
+ that would have caught the original defect.
+- The three swapped partials no longer read `params` at all. The filter
+ *controls* (`_groups_tab`, `_students_section`, `_topics_section`) still do,
+ to echo their own current `value`/`selected` — a control reflecting state is
+ not a decision, and that is where the convention stops.
+- The controller grows three ivars and two small private methods, and threads
+ two locals through the ivar→locals seam. Every future filterable list is
+ expected to pay that same small toll.
+- Adding a filter no longer means writing copy. It means adding a key to
+ `PARTICIPANT_FILTER_KEYS`/`TOPIC_FILTER_KEYS` so `filters_active?` sees it.
+- "Show all N" and the "Showing X of Y" footer are unchanged. `@total_group_count`
+ is the count of *matches* taken before truncation, so "Showing 25 of 40" under
+ an active search is correct, not a bug. `@total_count` (assigned twice) and
+ `@displayed_count` were read by no view and are deleted.
+
+## References
+
+- ADR 015 — the htmx decision this extends; it fixes the mechanism but is silent
+ on who decides what the swapped partial shows.
+- ADR 013 — the topics directory's browse-first shape, which is why a student's
+ policy-scoped list is the meaningful base there.
diff --git a/test/controllers/courses_controller_test.rb b/test/controllers/courses_controller_test.rb
index 94296377..8e4ad93d 100644
--- a/test/controllers/courses_controller_test.rb
+++ b/test/controllers/courses_controller_test.rb
@@ -606,6 +606,133 @@ class CoursesControllerTest < ActionDispatch::IntegrationTest
assert_no_match 'No project has been submitted yet.', response.body
end
+ # --- Empty vs no-matches (ADR 0018) -------------------------------------
+ #
+ # Every no-matches test asserts the *absence* of the genuinely-empty copy as
+ # well. That negative assertion is the regression guard: before the split, a
+ # search or supervisor filter that matched nothing fell through to the
+ # "nothing has ever existed here" branch and made a false claim about the
+ # course.
+
+ test 'groups table reports an empty course when no groups exist' do
+ course = create(:course, :grouped)
+ create(:enrolment, :coordinator, user: @coordinator_user, course: course)
+
+ sign_in @coordinator_user
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' }, params: { section: 'groups' }
+ assert_response :success
+ assert_includes response.body, 'No groups have been created yet.'
+ assert_no_match 'No groups match your current filters.', response.body
+ end
+
+ test 'groups table reports no matches when a search empties the list' do
+ course = create(:course, :grouped)
+ create(:enrolment, :coordinator, user: @coordinator_user, course: course)
+ create(:project_group, course: course, confirmed: true, group_name: 'Alpha Group')
+
+ sign_in @coordinator_user
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' },
+ params: { section: 'groups', search_query: 'zzzznomatch' }
+ assert_response :success
+ assert_includes response.body, 'No groups match your current filters.'
+ assert_includes response.body, 'Try adjusting your search or filters.'
+ assert_no_match 'No groups have been created yet.', response.body
+ end
+
+ test 'groups table reports no matches when a status filter empties the list' do
+ course = create(:course, :grouped)
+ create(:enrolment, :coordinator, user: @coordinator_user, course: course)
+ create(:project_group, course: course, confirmed: true, group_name: 'Alpha Group')
+
+ sign_in @coordinator_user
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' },
+ params: { section: 'groups', status_filter: 'approved' }
+ assert_response :success
+ assert_includes response.body, 'No groups match your current filters.'
+ assert_no_match 'No groups have been created yet.', response.body
+ # the pre-split per-filter copy is gone; one generic message serves every filter
+ assert_no_match 'No groups found with', response.body
+ end
+
+ test 'groups table reports no matches when a supervisor filter empties the list' do
+ course = create(:course, :grouped)
+ create(:enrolment, :coordinator, user: @coordinator_user, course: course)
+ idle_lecturer = create(:user, :staff)
+ create(:enrolment, :lecturer, user: idle_lecturer, course: course)
+ create(:project_group, course: course, confirmed: true, group_name: 'Alpha Group')
+
+ sign_in @coordinator_user
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' },
+ params: { section: 'groups', lecturer_filter: idle_lecturer.id.to_s }
+ assert_response :success
+ assert_includes response.body, 'No groups match your current filters.'
+ assert_no_match 'No groups have been created yet.', response.body
+ end
+
+ test 'students table reports an empty course when no students are enrolled' do
+ course = create(:course)
+ create(:enrolment, :coordinator, user: @coordinator_user, course: course)
+
+ sign_in @coordinator_user
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' }, params: { section: 'students' }
+ assert_response :success
+ assert_includes response.body, 'No students have been enrolled yet.'
+ assert_no_match 'No students match your current filters.', response.body
+ end
+
+ test 'students table reports no matches when a search empties the list' do
+ sign_in @coordinator_user
+ get course_path(@course), headers: { 'HTTP_HX_REQUEST' => 'true' },
+ params: { section: 'students', search_query: 'zzzznomatch' }
+ assert_response :success
+ assert_includes response.body, 'No students match your current filters.'
+ assert_includes response.body, 'Try adjusting your search or filters.'
+ assert_no_match 'No students have been enrolled yet.', response.body
+ end
+
+ test 'topics directory reports an empty course when it has no lecturers' do
+ course = create(:course)
+ create(:enrolment, :coordinator, user: @coordinator_user, course: course)
+
+ sign_in @coordinator_user
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' }, params: { section: 'topics' }
+ assert_response :success
+ assert_includes response.body, 'No topics are currently available.'
+ assert_no_match 'No topics match your current filters.', response.body
+ end
+
+ test 'topics directory reports no matches when a search empties every group' do
+ course, alice, = build_topic_directory_course
+ create_topic_on(course, alice, 'Machine Learning Basics', :approved)
+
+ sign_in @coordinator_user
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' },
+ params: { section: 'topics', search_query: 'zzzznomatch' }
+ assert_response :success
+ assert_includes response.body, 'No topics match your current filters.'
+ assert_includes response.body, 'Try adjusting your search or filters.'
+ assert_no_match 'No topics are currently available.', response.body
+ end
+
+ test 'topics a student scope hides is an empty state, never a filter miss' do
+ course, alice, = build_topic_directory_course
+ create_topic_on(course, alice, 'Unapproved Topic', :pending)
+
+ student = create(:user)
+ create(:enrolment, user: student, course: course)
+ sign_in student
+
+ # The draft is outside a student's policy scope, so the *unfiltered* list is
+ # empty. With a search active the groups are dropped and the empty branch
+ # fires — it must read as "nothing to show you", not as a filter miss, since
+ # the base is the policy-scoped list (ADR 0018).
+ get course_path(course), headers: { 'HTTP_HX_REQUEST' => 'true' },
+ params: { section: 'topics', search_query: 'anything' }
+ assert_response :success
+ assert_includes response.body, 'No topics are currently available.'
+ assert_no_match 'No topics match your current filters.', response.body
+ end
+
private
def build_topic_directory_course
diff --git a/test/integration/homescreen_cards_render_test.rb b/test/integration/homescreen_cards_render_test.rb
index 3f8afec0..ba897b86 100644
--- a/test/integration/homescreen_cards_render_test.rb
+++ b/test/integration/homescreen_cards_render_test.rb
@@ -7,6 +7,27 @@ class HomescreenCardsRenderTest < ActionDispatch::IntegrationTest
@course.enrolments.create!(user: @user, role: :student)
end
+ test 'orders courses by earliest enrolment on the homescreen and sidebar' do
+ @course.enrolments.find_by!(user: @user, role: :student).update!(created_at: 4.days.ago)
+
+ earlier_course = create(:course, course_name: 'Earlier Course')
+ create(:enrolment, user: @user, course: earlier_course, role: :student, created_at: 2.days.ago)
+ create(:enrolment, user: @user, course: earlier_course, role: :coordinator, created_at: 1.hour.ago)
+
+ later_course = create(:course, course_name: 'Later Course')
+ create(:enrolment, user: @user, course: later_course, role: :student, created_at: 1.day.ago)
+
+ post session_path, params: { email_address: @user.email_address, password: 'password' }
+ get root_path
+
+ expected_paths = [course_path(later_course), course_path(earlier_course), course_path(@course)]
+ card_paths = css_select("main a[href^='/courses/']").map { |link| link['href'] }
+ sidebar_paths = css_select("#app-sidebar a[href^='/courses/']").map { |link| link['href'] }
+
+ assert_equal expected_paths, card_paths
+ assert_equal expected_paths, sidebar_paths
+ end
+
test 'homescreen renders themed course cards via image_tag' do
post session_path, params: { email_address: @user.email_address, password: 'password' }
assert_redirected_to root_path
diff --git a/test/system/topics/copy_topic_dialog_test.rb b/test/system/topics/copy_topic_dialog_test.rb
index 14002fc7..38a1f7ad 100644
--- a/test/system/topics/copy_topic_dialog_test.rb
+++ b/test/system/topics/copy_topic_dialog_test.rb
@@ -11,7 +11,9 @@ class TopicCopyTopicDialogTest < BrowserSystemTestCase
create(:enrolment, :lecturer, user: @lecturer, course: @course)
# The course factory already creates a shorttext template field (Project Title).
- # Add a second (dropdown) field for richer assertions.
+ # Add a dropdown (Supervisor) and a textarea (Description) field so the copy
+ # path is exercised for every input type — the textarea case regressed once
+ # when its text-editor:update bridge was dropped in the redesign.
@template = @course.project_template
@template_field = @template.project_template_fields.create!(
label: 'Supervisor',
@@ -21,6 +23,13 @@ class TopicCopyTopicDialogTest < BrowserSystemTestCase
options: %w[Alice Bob],
is_project_title: false
)
+ @description_field = @template.project_template_fields.create!(
+ label: 'Description',
+ field_type: 'textarea',
+ applicable_to: 'both',
+ required: false,
+ is_project_title: false
+ )
# A topic owned by the lecturer with an approved instance + filled fields
@source_topic = create(:topic, course: @course, owner: @lecturer)
@@ -40,34 +49,87 @@ class TopicCopyTopicDialogTest < BrowserSystemTestCase
project_template_field: @template_field,
value: 'Alice'
)
+ @source_instance.project_instance_fields.create!(
+ project_template_field: @description_field,
+ value: 'A detailed markdown description **with emphasis**'
+ )
end
test 'opens dialog, shows source topic, loads step-2, and closes after copy' do
login_as(@lecturer)
visit new_course_topic_path(@course)
+ wait_for_turbo
- # Step 1: click "Reuse details from another topic" → dialog opens
- click_button 'Reuse details from another topic', wait: 3
-
+ # Step 1: click "Reuse details from another topic" → dialog opens.
+ # A physical Capybara click is intermittently swallowed by headless Chrome
+ # (the suite's known dropped-first-click race) even with wait_for_turbo, so
+ # fall back to a programmatic click if the dialog didn't stick.
+ assert_selector '#topic-form', wait: 3
+ trigger = find("button[data-action='click->copy-topic#open']", wait: 3)
+ unless page.has_selector?('dialog[open]', wait: 2)
+ trigger.click
+ unless page.has_selector?('dialog[open]', wait: 2)
+ page.execute_script(<<~JS)
+ document.querySelector("button[data-action='click->copy-topic#open']").click()
+ JS
+ end
+ end
assert_selector 'dialog[open]', wait: 3
assert_text 'Source Topic', wait: 3
- # Click the source topic card → turbo frame loads step-2
+ # Click the source topic card → turbo frame loads step-2 (same physical-
+ # click race; fall back to a programmatic click if the frame didn't move).
within 'dialog' do
- find('a', text: 'Source Topic').click
+ card = find('a', text: 'Source Topic')
+ unless page.has_text?('Copy details from', wait: 2)
+ card.click
+ unless page.has_text?('Copy details from', wait: 2)
+ page.execute_script(<<~JS)
+ [...document.querySelectorAll('dialog a')].find((a) => a.textContent.includes('Source Topic')).click()
+ JS
+ end
+ end
end
- assert_text 'Copying from', wait: 3
+ assert_text 'Copy details from', wait: 3
within 'dialog' do
assert_text 'Supervisor', wait: 3
end
# Click "Copy Details" → values transfer to the main form, dialog closes
+ # (same physical-click race; fall back to a programmatic click if the
+ # dialog doesn't close).
+ # Click "Copy Details" → values transfer to the main form, dialog closes
+ # (same physical-click race; fall back to a programmatic click if the
+ # dialog doesn't close). The open-state check must run at page scope, not
+ # inside `within 'dialog'` (which would only find a nested dialog).
within 'dialog' do
- click_button 'Copy Details'
+ find('button', text: 'Copy Details').click
+ end
+ unless page.has_no_selector?('dialog[open]', wait: 2)
+ page.execute_script(<<~JS)
+ [...document.querySelectorAll('dialog button')].find((b) => b.textContent.includes('Copy Details')).click()
+ JS
end
assert_no_selector 'dialog[open]', wait: 3
+
+ # The copied description must reach the EasyMDE editor on the main topic
+ # form (regression: the text-editor:update bridge was dropped in the
+ # redesign, so textarea copies never populated the visible editor — the
+ # raw textarea value alone synced back empty via forceSync).
+ editor_text = page.evaluate_script(<<~JS)
+ (() => {
+ const ta = document.querySelector("textarea[name='fields[#{@description_field.id}]']");
+ if (!ta) return null;
+ const wrapper = ta.closest('.space-y-1');
+ const cm = wrapper && wrapper.querySelector('.CodeMirror');
+ return cm ? cm.textContent : null;
+ })()
+ JS
+ assert_includes editor_text.to_s,
+ 'A detailed markdown description',
+ 'visible EasyMDE editor should show the copied description'
end
test 'topics/edit renders the modern takeover layout and template fields' do