<%= content_help %>
- <%= f.text_area content_field, rows: 3, placeholder: content_placeholder, - class: "w-full rounded border-gray-300 shadow-sm px-2 py-1 text-sm font-mono" %> -AWBW is approved by CAMFT…
<%= @event.title %>
-<%= paragraph %>
+<%= render layout: "events/callouts/callout_page", locals: { title: @builtin_title.presence || "Frequently asked questions" } do %> +<%= paragraph %>
+ <% end %> + <% if faq[:list] %> +Still have questions?
-You'll receive more details as we get closer to the training dates. In the meantime, please <%= link_to "reach out", contact_us_path, class: "text-blue-700 underline hover:text-blue-900" %> — we're always happy to help. We look forward to creating and connecting with you!
-Still have questions?
+You'll receive more details as we get closer to the training dates. In the meantime, please <%= link_to "reach out", contact_us_path, class: "text-blue-700 underline hover:text-blue-900" %> — we're always happy to help. We look forward to creating and connecting with you!
<%= @event.title %>
-Amount awarded
-<%= dollars_from_cents(@scholarship.amount_cents) %>
-Amount awarded
+<%= dollars_from_cents(@scholarship.amount_cents) %>
Funder
-<%= grant.funder_name %>
-<%= grant.name %>
-Scholarship requested
-Your scholarship request is under review. We'll be in touch about next steps — check back here for your award details.
-Funder
+<%= grant.funder_name %>
+<%= grant.name %>
Scholarship requested
+Your scholarship request is under review. We'll be in touch about next steps — check back here for your award details.
+<%= @event.title %>
-<%= @event.title %>
-Bring your license number.
") + get registration_ce_path(registration.slug) + expect(response.body).to include("Bring your license number.") + end + + it "renders the handouts callout's description" do + describe_callout("handouts", "Download these before class.
") + get registration_handouts_path(registration.slug) + expect(response.body).to include("Download these before class.") + end + + it "renders the FAQ callout's description" do + describe_callout("faq", "Read this intro first.
") + get registration_faq_path(registration.slug) + expect(response.body).to include("Read this intro first.") + end + + it "renders the scholarship callout's description" do + registration.update!(scholarship_requested: true) + describe_callout("scholarship", "About your scholarship.
") + get registration_scholarship_path(registration.slug) + expect(response.body).to include("About your scholarship.") + end + end + describe "POST /registration/:slug/ce/pay" do let(:event) { create(:event, ce_hours_offered: 6, ce_hours_cost_cents: 15_000) } let(:fake_session) { double(url: "https://checkout.stripe.com/test", id: "cs_test_123") } diff --git a/spec/requests/events/registration_ticket_callouts_spec.rb b/spec/requests/events/registration_ticket_callouts_spec.rb index fda9eb9a77..29b46d6910 100644 --- a/spec/requests/events/registration_ticket_callouts_spec.rb +++ b/spec/requests/events/registration_ticket_callouts_spec.rb @@ -246,7 +246,7 @@ } expect(event.registration_ticket_callouts.magic.pluck(:magic_key)).to contain_exactly( - "payment", "certificate", "scholarship", "ce_hours", "event_details", + "payment", "certificate", "scholarship", "ce_hours", "art_supplies", "videoconference", "handouts", "faq" ) end diff --git a/spec/requests/events_spec.rb b/spec/requests/events_spec.rb index ee87397c8a..c3809342ac 100644 --- a/spec/requests/events_spec.rb +++ b/spec/requests/events_spec.rb @@ -182,40 +182,6 @@ def offer_ce!(target_event) end end - describe "GET /details" do - let(:event) { create(:event, :published, :publicly_visible) } - - it "renders the details page when details are present" do - event.update!(event_details_label: "Art supplies", event_details: "Bring scissors
") - get details_event_path(event) - expect(response).to have_http_status(:ok) - expect(response.body).to include("Art supplies") - expect(response.body).to include("Bring scissors") - end - - it "redirects to the event when details are blank" do - get details_event_path(event) - expect(response).to redirect_to(event_path(event)) - end - end - - describe "GET /ce_hours" do - let(:event) { create(:event, :published, :publicly_visible) } - - it "renders the CE hours page when the event is CE-eligible" do - event.update!(ce_hours_offered: 6, ce_hours_details_label: "Continuing education", ce_hours_details: "Email your license number
") - get ce_hours_event_path(event) - expect(response).to have_http_status(:ok) - expect(response.body).to include("Continuing education") - expect(response.body).to include("Email your license number") - end - - it "redirects to the event when the event is not CE-eligible" do - get ce_hours_event_path(event) - expect(response).to redirect_to(event_path(event)) - end - end - describe "GET /new" do context "as admin" do it "renders successfully" do @@ -263,10 +229,10 @@ def offer_ce!(target_event) expect(response.body).to include(VisibilityFlagsHelper::FLAG_DEFINITIONS[:public_registration_enabled][:description]) end - it "renders the built-in 'Before you attend' card as an editable row" do + it "renders the built-in 'Art supplies' card as an editable row" do get edit_event_path(event) expect(response.body).to include("Registration ticket callouts") - expect(response.body).to include("Before you attend") + expect(response.body).to include("Art supplies") # Its text now lives on the callout row, not the event columns. expect(response.body).not_to include("event[event_details_label]") end diff --git a/spec/services/default_ticket_callouts_spec.rb b/spec/services/default_ticket_callouts_spec.rb index 7006d97eb2..a9c1e15cd5 100644 --- a/spec/services/default_ticket_callouts_spec.rb +++ b/spec/services/default_ticket_callouts_spec.rb @@ -9,7 +9,7 @@ keys = event.registration_ticket_callouts.magic.pluck(:magic_key) expect(keys).to contain_exactly( - "payment", "certificate", "scholarship", "ce_hours", "event_details", + "payment", "certificate", "scholarship", "ce_hours", "art_supplies", "videoconference", "handouts", "faq" ) end @@ -17,13 +17,13 @@ it "seeds callouts in canonical ticket order" do form = create(:form) event = create(:event, facilitator_training: true, ce_hours_offered: 6, - event_details: "x
", videoconference_url: "https://example.com/z") + videoconference_url: "https://example.com/z") event.event_forms.create!(form:, role: "scholarship") described_class.seed(event) expect(event.registration_ticket_callouts.ordered.map(&:magic_key)).to eq( - %w[payment certificate scholarship ce_hours event_details videoconference handouts faq] + %w[payment certificate scholarship ce_hours art_supplies videoconference handouts faq] ) end @@ -88,21 +88,17 @@ expect(payment.resources).to be_empty # no W-9 on a free event end - it "migrates CE hours and event-details content from the event onto the row" do - event = create(:event, ce_hours_details_label: "Continuing education", - ce_hours_details: "CAMFT approved.
", event_details_label: "Art supplies", - event_details: "Bring paper.
") + it "seeds the CE hours and art supplies cards with static titles and no page text" do + event = create(:event) described_class.seed(event) ce = event.registration_ticket_callouts.find_by(magic_key: "ce_hours") - details = event.registration_ticket_callouts.find_by(magic_key: "event_details") - expect(ce.title).to eq("Continuing education") - expect(ce.description).to eq("CAMFT approved.
") - expect(details.title).to eq("Art supplies") - expect(details.description).to eq("Bring paper.
") - # A freshly-migrated card matches its default. - expect(described_class.customized?(ce)).to be(false) + art_supplies = event.registration_ticket_callouts.find_by(magic_key: "art_supplies") + expect(ce.title).to eq("CE hours") + expect(ce.description).to be_blank + expect(art_supplies.title).to eq("Art supplies & what to bring") + expect(art_supplies.description).to be_blank end it "reports whether a materialized callout has been customized" do @@ -189,7 +185,7 @@ expect(event.registration_ticket_callouts.ordered.first).to eq(custom) expect(event.registration_ticket_callouts.ordered.map(&:magic_key).compact).to eq( - %w[payment certificate scholarship ce_hours event_details videoconference handouts faq] + %w[payment certificate scholarship ce_hours art_supplies videoconference handouts faq] ) end end diff --git a/spec/services/magic_ticket_callouts_spec.rb b/spec/services/magic_ticket_callouts_spec.rb index bbf2b60ad0..a19b8b97d4 100644 --- a/spec/services/magic_ticket_callouts_spec.rb +++ b/spec/services/magic_ticket_callouts_spec.rb @@ -55,7 +55,7 @@ def card(reg, title) end it "uses the arrow trailing icon for every card" do - event.update!(ce_hours_details: "6 hours", videoconference_url: "https://example.zoom.us/j/1") + event.update!(videoconference_url: "https://example.zoom.us/j/1") trailing = described_class.new(registration).cards.map(&:trailing_icon).uniq expect(trailing).to eq([ "fa-solid fa-arrow-right" ]) end @@ -75,10 +75,10 @@ def card(reg, title) end it "shows the CE card only when the registrant requested CE credit" do - expect(card_titles(registration)).not_to include(event.ce_hours_details_label) + expect(card_titles(registration)).not_to include("CE hours") license = create(:professional_license, :placeholder, person: registration.registrant) create(:continuing_education_registration, event_registration: registration, professional_license: license) - expect(card_titles(registration.reload)).to include(event.ce_hours_details_label) + expect(card_titles(registration.reload)).to include("CE hours") end it "turns the CE card orange while a balance is due, teal once paid" do @@ -87,7 +87,7 @@ def card(reg, title) ce = create(:continuing_education_registration, event_registration: registration, professional_license: license) # Balance due, license still needed: orange card, amber chip naming what's needed. - needs = card(registration.reload, event.ce_hours_details_label) + needs = card(registration.reload, "CE hours") expect(needs.theme).to eq(DomainTheme.swatch("orange")) expect(needs.subtitle).to eq("6 hours") expect(needs.badge).to eq("$150 · License number needed") @@ -95,14 +95,14 @@ def card(reg, title) # License provided but still owing: orange card, amber "$X due" chip like the payment card. license.update!(number: "LIC123") - due = card(registration.reload, event.ce_hours_details_label) + due = card(registration.reload, "CE hours") expect(due.theme).to eq(DomainTheme.swatch("orange")) expect(due.badge).to eq("$150 due") expect(due.badge_classes).to be_nil # Paid in full: resting teal card, no "due" chip. create(:allocation, allocatable: ce, amount: 15_000) - paid = card(registration.reload, event.ce_hours_details_label) + paid = card(registration.reload, "CE hours") expect(paid.theme).to eq(DomainTheme.swatch("teal")) expect(paid.badge).to be_nil end @@ -143,19 +143,20 @@ def card(reg, title) end it "places payment first and FAQ last in the full ordering" do - event.update!(facilitator_training: true, event_details: "Bring supplies", - ce_hours_details: "6 hours", ce_hours_offered: 6, + event.update!(facilitator_training: true, + ce_hours_offered: 6, videoconference_url: "https://example.zoom.us/j/123", start_date: 3.days.ago, end_date: 2.days.ago) registration.update!(status: "attended", scholarship_requested: true) license = create(:professional_license, :placeholder, person: registration.registrant) create(:continuing_education_registration, event_registration: registration, professional_license: license) + # art_supplies is a content callout (no fallback card); it renders from its + # materialized row on the generic callout page, not here. expect(card_titles(registration)).to eq([ "Make your payment", "Certificate of completion", "Scholarship", - event.ce_hours_details_label, - event.event_details_label, + "CE hours", "Videoconference", "Handouts", "Frequently asked questions" diff --git a/spec/system/event_registration_show_spec.rb b/spec/system/event_registration_show_spec.rb index db88b5bb54..c6c430295e 100644 --- a/spec/system/event_registration_show_spec.rb +++ b/spec/system/event_registration_show_spec.rb @@ -60,20 +60,25 @@ end describe "before-you-attend call-out" do - it "links to the details page using the event's label when details are present" do - event.update!(event_details_label: "Art supplies", event_details: "Bring scissors
") + let!(:details) do + create(:registration_ticket_callout, event:, magic_key: "art_supplies", + title: "Art supplies", callout_type: "reference", hidden: true) + end + + it "links to its own callout page when published with content" do + details.update!(description: "Bring scissors
", hidden: false) sign_in(user) visit registration_ticket_path(registration.slug) - expect(page).to have_link("Art supplies", href: details_event_path(event, reg: registration.slug)) + expect(page).to have_link("Art supplies", href: event_registration_ticket_callout_path(event, details, reg: registration.slug)) end - it "is hidden when no details are set" do + it "is hidden when the callout is not published" do sign_in(user) visit registration_ticket_path(registration.slug) - expect(page).to have_no_link(href: details_event_path(event, reg: registration.slug)) + expect(page).to have_no_link(href: event_registration_ticket_callout_path(event, details, reg: registration.slug)) end end diff --git a/spec/views/page_bg_class_alignment_spec.rb b/spec/views/page_bg_class_alignment_spec.rb index e79302a91d..ac739ab097 100644 --- a/spec/views/page_bg_class_alignment_spec.rb +++ b/spec/views/page_bg_class_alignment_spec.rb @@ -209,8 +209,6 @@ "app/views/events/callouts/handouts.html.erb" => "public", "app/views/events/callouts/resource.html.erb" => "public", "app/views/events/callouts/videoconference.html.erb" => "public", - "app/views/events/details.html.erb" => "public", - "app/views/events/ce_hours.html.erb" => "public", "app/views/registration_ticket_callouts/show.html.erb" => "public", # ─── bulk payment views ───