Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Storefront: page sections controller
Damian Legawiecb3b0b8f0207c
diff --git a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rbindex 2e02e91b28..1dbe2ae851 100644--- a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb@@ -15,7 +15,7 @@ RSpec.describe Spree::Admin::PageBlocksController, type: :controller doenddescribe '#destroy' do- let(:page_section) { create(:featured_taxon, pageable: page) }+ let(:page_section) { create(:featured_taxon_section, pageable: page) }let!(:page_block) { create(:page_block, :buttons, section: page_section) }it 'destroys the page block' do@@ -26,7 +26,7 @@ RSpec.describe Spree::Admin::PageBlocksController, type: :controller doenddescribe '#move_higher' do- let(:page_section) { create(:featured_taxon) }+ let(:page_section) { create(:featured_taxon_section) }let!(:another_page_block) { create(:page_block, :buttons, section: page_section, position: 1) }let!(:page_block) { create(:page_block, :buttons, section: page_section, position: 2) }@@ -38,7 +38,7 @@ RSpec.describe Spree::Admin::PageBlocksController, type: :controller doenddescribe '#move_lower' do- let(:page_section) { create(:featured_taxon) }+ let(:page_section) { create(:featured_taxon_section) }let!(:page_block) { create(:page_block, :buttons, section: page_section, position: 1) }let!(:another_page_block) { create(:page_block, :buttons, section: page_section, position: 2) }@@ -53,7 +53,7 @@ RSpec.describe Spree::Admin::PageBlocksController, type: :controller dosubject { post :create, params: { page_block: { type: page_block_type }, page_section_id: page_section.id }, format: :turbo_stream }let(:page_block_type) { 'Spree::PageBlocks::Buttons' }- let(:page_section) { create(:featured_taxon) }+ let(:page_section) { create(:featured_taxon_section) }it 'creates page block of the given type' doexpect { subject }.to change(Spree::PageBlock, :count).by(1)diff --git a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rbindex 57e92ca526..0535110a27 100644--- a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb@@ -56,7 +56,7 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller dodescribe '#destroy' docontext 'when page section can be deleted' do- let!(:page_section) { create(:featured_taxon, pageable: page) }+ let!(:page_section) { create(:featured_taxon_section, pageable: page) }it 'deletes the page section' doexpect { delete :destroy, params: { id: page_section.id }, format: :turbo_stream }.to change(Spree::PageSection, :count).by(-1)@@ -74,8 +74,8 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller dodescribe '#move_higher' docontext 'within page' do- let!(:another_page_section) { create(:featured_taxon, pageable: page, position: 1) }- let!(:page_section) { create(:featured_taxon, pageable: page, position: 2) }+ let!(:another_page_section) { create(:featured_taxon_section, pageable: page, position: 1) }+ let!(:page_section) { create(:featured_taxon_section, pageable: page, position: 2) }it 'moves the page section higher' doput :move_higher, params: { id: page_section.id, page_id: page.id }, format: :turbo_stream@@ -85,8 +85,8 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller doendcontext 'within theme' do- let!(:another_page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 1) }- let!(:page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 2) }+ let!(:another_page_section) { create(:featured_taxon_section, pageable: theme, pageable_type: "Spree::Theme", position: 1) }+ let!(:page_section) { create(:featured_taxon_section, pageable: theme, pageable_type: "Spree::Theme", position: 2) }it 'moves the page section higher' doold_position = page_section.position@@ -99,8 +99,8 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller dodescribe '#move_lower' docontext 'within page' do- let!(:page_section) { create(:featured_taxon, pageable: page, position: 1) }- let!(:another_page_section) { create(:featured_taxon, pageable: page, position: 2) }+ let!(:page_section) { create(:featured_taxon_section, pageable: page, position: 1) }+ let!(:another_page_section) { create(:featured_taxon_section, pageable: page, position: 2) }it 'moves the page section lower' doput :move_lower, params: { id: page_section.id, page_id: page.id }, format: :turbo_stream@@ -110,8 +110,8 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller doendcontext 'within theme' do- let!(:page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 1) }- let!(:another_page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 2) }+ let!(:page_section) { create(:featured_taxon_section, pageable: theme, pageable_type: "Spree::Theme", position: 1) }+ let!(:another_page_section) { create(:featured_taxon_section, pageable: theme, pageable_type: "Spree::Theme", position: 2) }it 'moves the page section lower' doold_position = page_section.position@@ -123,7 +123,7 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller doenddescribe '#restore_design_settings_to_defaults' do- let(:page_section) { create(:featured_taxon, preferred_top_padding: 50) }+ let(:page_section) { create(:featured_taxon_section, preferred_top_padding: 50) }it 'restores the design settings to defaults' doexpect(page_section.preferred_top_padding).to eq 50diff --git a/core/lib/spree/testing_support/factories/page_section_factory.rb b/core/lib/spree/testing_support/factories/page_section_factory.rbindex 96ce9120c1..dff6353638 100644--- a/core/lib/spree/testing_support/factories/page_section_factory.rb+++ b/core/lib/spree/testing_support/factories/page_section_factory.rb@@ -7,7 +7,7 @@ FactoryBot.define dotype { 'Spree::PageSections::FeaturedTaxons' }end- factory :featured_taxon, class: Spree::PageSections::FeaturedTaxon+ factory :featured_taxon_section, class: Spree::PageSections::FeaturedTaxontrait :header dotype { 'Spree::PageSections::Header' }diff --git a/core/spec/models/spree/page_sections/featured_taxon_spec.rb b/core/spec/models/spree/page_sections/featured_taxon_spec.rbindex 33c5e16a31..58039a13e0 100644--- a/core/spec/models/spree/page_sections/featured_taxon_spec.rb+++ b/core/spec/models/spree/page_sections/featured_taxon_spec.rb@@ -4,8 +4,8 @@ RSpec.describe Spree::PageSections::FeaturedTaxon dodescribe '.by_taxon_id' dolet!(:taxons) { create_list(:taxon, 3) }- let!(:featured_taxon_1) { create(:featured_taxon, preferred_taxon_id: taxons[0].id) }- let!(:featured_taxon_2) { create(:featured_taxon, preferred_taxon_id: taxons[1].id) }+ let!(:featured_taxon_1) { create(:featured_taxon_section, preferred_taxon_id: taxons[0].id) }+ let!(:featured_taxon_2) { create(:featured_taxon_section, preferred_taxon_id: taxons[1].id) }it 'returns featured taxons by the taxon id' doexpect(described_class.by_taxon_id(taxons[0].id)).to contain_exactly(featured_taxon_1)diff --git a/core/spec/models/spree/taxon_spec.rb b/core/spec/models/spree/taxon_spec.rbindex 52674fd6ef..352e699f82 100644--- a/core/spec/models/spree/taxon_spec.rb+++ b/core/spec/models/spree/taxon_spec.rb@@ -127,7 +127,7 @@ describe Spree::Taxon, type: :model dodescribe 'after_destroy :remove_all_featured_sections' dolet(:taxon) { create(:taxon) }- let!(:featured_section) { create(:featured_taxon, preferred_taxon_id: taxon.id) }+ let!(:featured_section) { create(:featured_taxon_section, preferred_taxon_id: taxon.id) }it 'removes the associated featured section' doexpect { taxon.destroy! }.to change(Spree::PageSections::FeaturedTaxon, :count).from(3).to(2)@@ -768,7 +768,7 @@ describe Spree::Taxon, type: :model dosubject { taxon.featured? }let(:taxon) { create(:taxon) }- let!(:featured_section) { create(:featured_taxon, preferred_taxon_id: featured_taxon.id) }+ let!(:featured_section) { create(:featured_taxon_section, preferred_taxon_id: featured_taxon.id) }context 'with a featured section' dolet(:featured_taxon) { taxon }diff --git a/storefront/app/controllers/spree/page_sections_controller.rb b/storefront/app/controllers/spree/page_sections_controller.rbnew file mode 100644index 0000000000..1acbc0f641--- /dev/null+++ b/storefront/app/controllers/spree/page_sections_controller.rb@@ -0,0 +1,17 @@+module Spree+ class PageSectionsController < StoreController+ helper_method :section_variables++ def show+ @section = Spree::PageSection.with_deleted.find(params[:id])+ end++ def section_variables+ @section_variables ||= begin+ variables = {}++ variables+ end+ end+ end+enddiff --git a/storefront/spec/controllers/spree/page_sections_controller_spec.rb b/storefront/spec/controllers/spree/page_sections_controller_spec.rbnew file mode 100644index 0000000000..8f2a038ceb--- /dev/null+++ b/storefront/spec/controllers/spree/page_sections_controller_spec.rb@@ -0,0 +1,34 @@+require 'spec_helper'++RSpec.describe Spree::PageSectionsController, type: :controller do+ let(:store) { Spree::Store.default }+ let(:theme) { create(:theme, store: store) }+ let(:section) { create(:featured_taxon_section) }++ before do+ allow(controller).to receive(:current_store).and_return(store)+ allow(controller).to receive(:current_theme).and_return(theme)+ end++ describe 'GET #show' do+ context 'when section exists' do+ before { get :show, params: { id: section.id } }++ it 'assigns @section' do+ expect(assigns(:section)).to eq(section)+ end++ it 'renders the show template' do+ expect(response).to render_template(:show)+ end+ end++ context 'when section does not exist' do+ it 'raises ActiveRecord::RecordNotFound' do+ expect {+ get :show, params: { id: 'nonexistent' }+ }.to raise_error(ActiveRecord::RecordNotFound)+ end+ end+ end+end