From 4543ba7aef6bcf11af30d13cae702a9fa07c3ac3 Mon Sep 17 00:00:00 2001 From: leefaisonr Date: Fri, 9 Jun 2023 16:52:22 -0400 Subject: [PATCH 1/2] Add SubGuideCard records to GuideCard show page Co-authored-by: Anna Headley --- app/views/guide_cards/index.html.erb | 2 +- app/views/guide_cards/show.html.erb | 14 +++++++++++--- spec/system/guide_cards_spec.rb | 17 +++++++++++++---- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/views/guide_cards/index.html.erb b/app/views/guide_cards/index.html.erb index f95b9b15..21d8119d 100644 --- a/app/views/guide_cards/index.html.erb +++ b/app/views/guide_cards/index.html.erb @@ -1,7 +1,7 @@

GuideCard Index

<% @guide_cards.each do |card| %> -

<%= link_to card.heading, guide_card_path(card.id) %>

+

<%= link_to card.heading, guide_card_path(card.id) %>

<% end %> <%= paginate @guide_cards %> \ No newline at end of file diff --git a/app/views/guide_cards/show.html.erb b/app/views/guide_cards/show.html.erb index 0645b2e3..ac878987 100644 --- a/app/views/guide_cards/show.html.erb +++ b/app/views/guide_cards/show.html.erb @@ -1,5 +1,13 @@ -

<%= @guide_card.heading %>

-

<%= @guide_card.sortid %>

-

<%= @guide_card.path %>

+

<%= @guide_card.heading %>

+

<%= @guide_card.sortid %>

+

<%= @guide_card.path %>

+

SubGuide for record 3

+ \ No newline at end of file diff --git a/spec/system/guide_cards_spec.rb b/spec/system/guide_cards_spec.rb index 104c146d..8bad0436 100644 --- a/spec/system/guide_cards_spec.rb +++ b/spec/system/guide_cards_spec.rb @@ -3,11 +3,12 @@ require 'rails_helper' RSpec.describe 'GuideCards', type: :system, js: true do + let(:guide_card_fixture) { Rails.root.join('spec', 'fixtures', 'guide_card_fixture.csv') } + before do + GuideCardLoadingService.new(csv_location: guide_card_fixture).import + end + describe 'GuideCards index page' do - let(:guide_card_fixture) { Rails.root.join('spec', 'fixtures', 'guide_card_fixture.csv') } - before do - GuideCardLoadingService.new(csv_location: guide_card_fixture).import - end it 'displays pagination controls' do visit '/guide_cards' expect(page).to have_link('Next', href: '/guide_cards?page=2') @@ -15,4 +16,12 @@ expect(page).to have_link('A.M.') end end + + describe 'GuideCards show page' do + it 'displays children SubGuide cards' do + # children_sub_guide = SubGuideCard.create(parentid: GuideCard.find(3).sortid, heading: 'SubGuide for record 3') + visit '/guide_cards/3' + expect(page).to have_text 'SubGuide for record 3' + end + end end From 0d0dcde9ca57effb7d20dfca941d7094c03c3f28 Mon Sep 17 00:00:00 2001 From: leefaisonr Date: Wed, 2 Aug 2023 10:08:25 -0400 Subject: [PATCH 2/2] Load sub guide cards for display Co-authored-by: Anna Headley --- app/controllers/guide_cards_controller.rb | 1 + app/views/guide_cards/show.html.erb | 12 +++++------- spec/system/guide_cards_spec.rb | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/guide_cards_controller.rb b/app/controllers/guide_cards_controller.rb index 65bd5b0e..e216ae68 100644 --- a/app/controllers/guide_cards_controller.rb +++ b/app/controllers/guide_cards_controller.rb @@ -8,5 +8,6 @@ def index def show @guide_card = GuideCard.find(params[:id]) + @sub_guide_cards = @guide_card.children end end diff --git a/app/views/guide_cards/show.html.erb b/app/views/guide_cards/show.html.erb index ac878987..c272788d 100644 --- a/app/views/guide_cards/show.html.erb +++ b/app/views/guide_cards/show.html.erb @@ -3,11 +3,9 @@

<%= @guide_card.path %>

-

SubGuide for record 3

+

List of SubGuide cards

    -
  • -<%# @sub_guide_cards.each do |sub_guide| %> -<%# end %> -<%# Need to set subguide card in my controller %> -
  • -
\ No newline at end of file + <% @sub_guide_cards.each do |sub_guide| %> +
  • <%= sub_guide.heading %>
  • + <% end %> + diff --git a/spec/system/guide_cards_spec.rb b/spec/system/guide_cards_spec.rb index 8bad0436..d471f01e 100644 --- a/spec/system/guide_cards_spec.rb +++ b/spec/system/guide_cards_spec.rb @@ -19,9 +19,9 @@ describe 'GuideCards show page' do it 'displays children SubGuide cards' do - # children_sub_guide = SubGuideCard.create(parentid: GuideCard.find(3).sortid, heading: 'SubGuide for record 3') + SubGuideCard.create(parentid: GuideCard.find(3).sortid, heading: 'Institut fizicheskoi >') visit '/guide_cards/3' - expect(page).to have_text 'SubGuide for record 3' + expect(page).to have_text 'Institut fizicheskoi >' end end end