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
Fixed proper product URLs generation in JSON LD + added specs (#12827)
Damian Legawiec74e07467d2c6
diff --git a/storefront/app/helpers/spree/products_helper.rb b/storefront/app/helpers/spree/products_helper.rbindex 4f899acc58..25acc2ab54 100644--- a/storefront/app/helpers/spree/products_helper.rb+++ b/storefront/app/helpers/spree/products_helper.rb@@ -165,7 +165,7 @@ module Spree{'@type' => 'ListItem','position' => index + 1,- 'url' => spree.product_url(product_slug)+ 'url' => spree.product_url(product_slug, host: current_store.url_or_custom_domain)}endenddiff --git a/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erb b/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erbindex 7731dd5d01..e3e0ccf4d7 100644--- a/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erb@@ -89,7 +89,7 @@<% if presenter.product %><div class="absolute flex" data-controller="copy-input"><div class="has-float-label flex flex-col max-w-[200px]">- <%= text_field_tag "product-#{presenter.product.id}-share-link", spree.product_url(presenter.product, host: current_store.url), class: 'text-ellipsis text-input border-r-0 !rounded-r-none !rounded-l-md', readonly: true, type: 'text', onclick: 'this.select()', data: { copy_input_target: 'input' } %>+ <%= text_field_tag "product-#{presenter.product.id}-share-link", spree.product_url(presenter.product, host: current_store.url_or_custom_domain), class: 'text-ellipsis text-input border-r-0 !rounded-r-none !rounded-l-md', readonly: true, type: 'text', onclick: 'this.select()', data: { copy_input_target: 'input' } %><%= label_tag "product-#{presenter.product.id}-share-link", Spree.t(:link) %></div><buttondiff --git a/storefront/app/views/themes/default/spree/products/_json_ld.html.erb b/storefront/app/views/themes/default/spree/products/_json_ld.html.erbindex 330abe2f73..fe8a42db03 100644--- a/storefront/app/views/themes/default/spree/products/_json_ld.html.erb+++ b/storefront/app/views/themes/default/spree/products/_json_ld.html.erb@@ -4,7 +4,7 @@"@context": "https://schema.org/","@type": "Product","name": <%= product.name.to_json.html_safe %>,- "url": <%= spree.product_url(product).to_json.html_safe %>,+ "url": <%= spree.product_url(product, host: current_store.url_or_custom_domain).to_json.html_safe %>,<% if product.featured_image %>"image": [<%= spree_image_url(product.featured_image, width: 630, height: 630).to_json.html_safe %>diff --git a/storefront/app/views/themes/default/spree/products/_json_ld_variant.html.erb b/storefront/app/views/themes/default/spree/products/_json_ld_variant.html.erbindex d94a2c2d00..c26b011ef8 100644--- a/storefront/app/views/themes/default/spree/products/_json_ld_variant.html.erb+++ b/storefront/app/views/themes/default/spree/products/_json_ld_variant.html.erb@@ -6,5 +6,5 @@"availability": "http://schema.org/<%= variant.available? ? 'InStock' : 'OutOfStock' %>","price": <%= variant.amount_in(current_currency).to_json.html_safe %>,"priceCurrency": <%= current_currency.to_json.html_safe %>,- "url": <%= spree.product_url(product, variant_id: variant.id).to_json.html_safe %>+ "url": <%= spree.product_url(product, variant_id: variant.id, host: current_store.url_or_custom_domain).to_json.html_safe %>}diff --git a/storefront/app/views/themes/default/spree/products/filters/_availability.html.erb b/storefront/app/views/themes/default/spree/products/filters/_availability.html.erbindex b234cad40d..e1824b0938 100644--- a/storefront/app/views/themes/default/spree/products/filters/_availability.html.erb+++ b/storefront/app/views/themes/default/spree/products/filters/_availability.html.erb@@ -4,7 +4,7 @@data-accordion-close-others-value="false"><% availability_filter_opened = permitted_products_params.dig(:filter, :purchasable).present? || permitted_products_params.dig(:filter, :out_of_stock).present? %><%= link_to "#availability_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if availability_filter_opened}", data: { action: 'accordion#toggle:prevent' } do %>- <%= Spree.t(:availability) %>+ <%= Spree.t(:availability).capitalize %><%= render 'spree/shared/icons/chevron_down' %><% end %><div class='st-accordion__content' data-accordion-id='availability_filter'>diff --git a/storefront/spec/features/product_list_spec.rb b/storefront/spec/features/product_list_spec.rbnew file mode 100644index 0000000000..f3dc9fe77d--- /dev/null+++ b/storefront/spec/features/product_list_spec.rb@@ -0,0 +1,291 @@+require 'spec_helper'++RSpec.describe 'Product list', type: :feature, js: true, job: true do+ let!(:product1) { create(:product, name: 'Running Jacket', price: 20.00) }+ let!(:product2) { create(:product, name: 'Waterproof Shoes', price: 10.00) }+ let!(:product3) { create(:product, name: 'Warming gloves', price: 30.00) }+ let!(:product4) do+ create(:product, name: 'Product out of stock') do |product|+ product.master.stock_items.update_all(backorderable: false)+ product.touch+ end+ end+ let!(:product5) do+ product = create(:product, name: 'Product without price')+ product.master.prices.delete_all+ product+ end+ let!(:product6) { create(:product, name: 'Product for free', price: 0.00) }++ let!(:size) { Spree::OptionType.find_by(name: 'size') || create(:option_type, :size) }+ let!(:small) { create(:option_value, option_type: size, name: 'small', presentation: 'Small') }+ let!(:medium) { create(:option_value, option_type: size, name: 'medium', presentation: 'Medium') }+ let!(:large) { create(:option_value, option_type: size, name: 'large', presentation: 'Large') }++ let(:store) { Spree::Store.default }++ let!(:product_option_type1) { create(:product_option_type, product: product1, option_type: size) }++ it 'does not include products with prices not set' do+ visit spree.products_path++ expect(page).not_to have_content('Product without price')+ end++ describe 'prices' do+ before { visit spree.products_path }++ context 'when product does not have variants' do+ context 'when not on sale' do+ it 'shows regular price' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_content('$20.00')+ end+ end+ end++ context 'when on sale' do+ before do+ product1.master.prices.update_all(compare_at_amount: 40.00)+ product1.touch+ visit spree.products_path+ end++ it 'shows sale price' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_content('$20.00')+ end+ end++ it 'shows compare at price' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_css('p.line-through', text: '$40.00')+ end+ end+ end+ end++ context 'when product has variants' do+ let!(:variant1) { create(:variant, product: product1, option_values: [small], price: price1) }+ let!(:variant2) { create(:variant, product: product1, option_values: [medium], price: price2) }+ let!(:variant3) { create(:variant, product: product1, option_values: [large], price: price3) }++ before do+ product1.master.prices.delete_all+ visit spree.products_path+ end++ context 'when variants have same prices' do+ let(:price1) { 100.00 }+ let(:price2) { 100.00 }+ let(:price3) { 100.00 }++ it 'shows common price' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_content('$100.00')+ end+ end++ context 'when some variants is on sale' do+ before do+ variant1.prices.update_all(amount: 100.00, compare_at_amount: 120.00)+ variant1.product.touch+ visit spree.products_path+ end++ it 'shows sale price' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_content('$100.00')+ end+ end++ xit 'shows the highest compare at price' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_css('p.line-through', text: '$120.00')+ end+ end++ it 'does not show From phrase' do+ within("#product-card-#{product1.id}") do+ expect(page).not_to have_text('From')+ end+ end+ end+ end++ context 'when variants have different prices' do+ let(:price1) { 100.00 }+ let(:price2) { 150.00 }+ let(:price3) { 200.00 }++ it 'shows From: $100.00' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_text('From: $100.00')+ end+ end++ context 'when some variant is on sale' do+ context 'when its the cheapest variant' do+ before do+ variant2.prices.update_all(amount: 90.00, compare_at_amount: 150.00)+ variant2.product.touch+ visit spree.products_path+ end++ it 'shows From: $90.00' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_text('From: $90.00')+ end+ end++ it 'shows compare at price of the cheapest variant' do+ within("#product-card-#{product1.id}") do+ expect(page).to have_css('p.line-through', text: '$150.00')+ end+ end+ end+ end+ end+ end+ end++ describe 'searching' do+ let!(:products) { create_list(:product, 10, price: 5.00) }++ it do+ visit spree.products_path++ expect(page).to have_content('Running Jacket')+ expect(page).to have_content('Waterproof Shoes')+ expect(page).to have_content('Warming gloves')++ click_on 'Search'+ fill_in('q', with: 'Jacket').send_keys(:enter)++ expect(page).to have_content('Running Jacket')+ expect(page).not_to have_content('Waterproof Shoes')+ expect(page).not_to have_content('Warming gloves')++ # Empty search bar returns all products+ click_on 'Search'+ fill_in('q', with: '').send_keys(:enter)++ expect(page).to have_content('Running Jacket')+ expect(page).to have_content('Waterproof Shoes')+ expect(page).to have_content('Warming gloves')+ end+ end++ describe 'sorting' do+ let!(:completed_order_1) { create(:completed_order_with_totals, variants: [product1.master, product2.master, product3.master, product6.master]) }+ let!(:completed_order_2) { create(:completed_order_with_totals, variants: [product1.master, product2.master, product3.master, product6.master]) }+ let!(:completed_order_3) { create(:completed_order_with_totals, variants: [product1.master, product2.master, product3.master, product6.master]) }+ let!(:completed_order_4) { create(:completed_order_with_totals, variants: [product2.master, product6.master]) }+ let!(:completed_order_5) { create(:completed_order_with_totals, variants: [product2.master, product6.master]) }+ let!(:completed_order_6) { create(:completed_order_with_totals, variants: [product6.master]) }++ before do+ visit spree.products_path+ end++ it 'can sort by best selling' do+ click_on 'sort-button'+ choose Spree.t('products_sort_options.best_selling'), allow_label_click: true+ wait_for_turbo++ within('.page-contents') do+ expect(page.all('.product-card-title').map(&:text)).to eq [+ product6.name,+ product2.name,+ product1.name,+ product3.name,+ product4.name+ ]+ end+ end++ it 'can sort alphabetically A-Z' do+ click_on 'sort-button'+ choose Spree.t('products_sort_options.name_a_z'), allow_label_click: true+ wait_for_turbo++ within('.page-contents') do+ expect(page.all('.product-card-title').map(&:text)).to eq [+ product6.name,+ product4.name,+ product1.name,+ product3.name,+ product2.name,+ ]+ end+ end++ it 'can sort alphabetically Z-A' do+ click_on 'sort-button'+ choose Spree.t('products_sort_options.name_z_a'), allow_label_click: true+ wait_for_turbo++ within('.page-contents') do+ expect(page.all('.product-card-title').map(&:text)).to eq [+ product2.name,+ product3.name,+ product1.name,+ product4.name,+ product6.name+ ]+ end+ end++ it 'can sort by price in ascending order' do+ click_on 'sort-button'+ choose Spree.t('products_sort_options.price_low_to_high'), allow_label_click: true+ wait_for_turbo++ within('.page-contents') do+ expect(page.all('.product-card-price p').map(&:text)).to eq ['$0.00', '$10.00', '$19.99', '$20.00', '$30.00']+ end+ end++ it 'can sort by price in descending order' do+ click_on 'sort-button'+ choose Spree.t('products_sort_options.price_high_to_low'), allow_label_click: true+ wait_for_turbo++ within('.page-contents') do+ expect(page.all('.product-card-price p').map(&:text)).to eq ['$30.00', '$20.00', '$19.99', '$10.00', '$0.00']+ end+ end++ it 'can sort by newest' do+ click_on 'sort-button'+ choose Spree.t('products_sort_options.newest_first'), allow_label_click: true+ wait_for_turbo++ within('.page-contents') do+ expect(page.all('.product-card-title').map(&:text)).to eq [+ product6.name,+ product4.name,+ product3.name,+ product2.name,+ product1.name,+ ]+ end+ end++ it 'can sort by oldest' do+ click_on 'sort-button'+ choose Spree.t('products_sort_options.oldest_first'), allow_label_click: true+ wait_for_turbo++ within('.page-contents') do+ expect(page.all('.product-card-title').map(&:text)).to eq [+ product1.name,+ product2.name,+ product3.name,+ product4.name,+ product6.name,+ ]+ end+ end+ end+end