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
Added `render_views` to Storefront controller tests for better test accurency
Damian Legawiec29f3ea663685
diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rbindex 09c3aa2804..3a89ac64e9 100644--- a/admin/app/helpers/spree/admin/base_helper.rb+++ b/admin/app/helpers/spree/admin/base_helper.rb@@ -200,11 +200,6 @@ module Spreedom_id(record, 'spree')end- I18N_PLURAL_MANY_COUNT = 2.1- def plural_resource_name(resource_class)- resource_class.model_name.human(count: I18N_PLURAL_MANY_COUNT)- end-def required_span_tagcontent_tag(:span, ' *', class: 'required font-weight-bold text-danger')enddiff --git a/core/app/helpers/spree/base_helper.rb b/core/app/helpers/spree/base_helper.rbindex 66d422065d..c1661334e4 100644--- a/core/app/helpers/spree/base_helper.rb+++ b/core/app/helpers/spree/base_helper.rb@@ -288,5 +288,10 @@ module Spreedef legal_policy(policy)current_store.send("customer_#{policy}")&.body&.html_safeend++ I18N_PLURAL_MANY_COUNT = 2.1+ def plural_resource_name(resource_class)+ resource_class.model_name.human(count: I18N_PLURAL_MANY_COUNT)+ endendenddiff --git a/storefront/spec/controllers/spree/account/orders_controller_spec.rb b/storefront/spec/controllers/spree/account/orders_controller_spec.rbindex d267699d19..99b5489dc7 100644--- a/storefront/spec/controllers/spree/account/orders_controller_spec.rb+++ b/storefront/spec/controllers/spree/account/orders_controller_spec.rb@@ -5,6 +5,8 @@ describe Spree::Account::OrdersController, type: :controller dolet(:user) { create(:user) }let(:order) { create(:completed_order_with_totals, user: user, store: store) }+ render_views+before doallow(controller).to receive(:current_store).and_return(store)allow(controller).to receive(:spree_login_path).and_return('/login')diff --git a/storefront/spec/controllers/spree/account/wished_items_controller_spec.rb b/storefront/spec/controllers/spree/account/wished_items_controller_spec.rbindex 54c05f9b59..812f48c20a 100644--- a/storefront/spec/controllers/spree/account/wished_items_controller_spec.rb+++ b/storefront/spec/controllers/spree/account/wished_items_controller_spec.rb@@ -7,6 +7,8 @@ describe Spree::Account::WishedItemsController, type: :controller dolet(:user) { create(:user) }let(:wishlist) { create(:wishlist, user: user, store: store, is_default: true) }+ render_views+before doallow(controller).to receive(:current_store).and_return(store)allow(controller).to receive(:spree_login_path).and_return('/login')diff --git a/storefront/spec/controllers/spree/addresses_controller_spec.rb b/storefront/spec/controllers/spree/addresses_controller_spec.rbindex 93c5d3c480..3b0166d3fa 100644--- a/storefront/spec/controllers/spree/addresses_controller_spec.rb+++ b/storefront/spec/controllers/spree/addresses_controller_spec.rb@@ -9,6 +9,8 @@ describe Spree::AddressesController, type: :controller dolet(:default_billing) { 'true' }let(:default_shipping) { 'true' }+ render_views+before doallow(controller).to receive_messages try_spree_current_user: userallow(controller).to receive_messages spree_current_user: userdiff --git a/storefront/spec/controllers/spree/contacts_controller_spec.rb b/storefront/spec/controllers/spree/contacts_controller_spec.rbindex f1952e49e5..0821a77ec9 100644--- a/storefront/spec/controllers/spree/contacts_controller_spec.rb+++ b/storefront/spec/controllers/spree/contacts_controller_spec.rb@@ -4,6 +4,12 @@ RSpec.describe Spree::ContactsController, type: :controller dolet(:store) { Spree::Store.default }let(:contact_params) { { name: "John Doe", email: "[email protected]", message: "Test message" } }+ render_views++ before do+ allow(controller).to receive(:current_store).and_return(store)+ end+context 'when customer support email is not configured' dobefore dostore.update(customer_support_email: nil)diff --git a/storefront/spec/controllers/spree/home_controller_spec.rb b/storefront/spec/controllers/spree/home_controller_spec.rbindex 86b1f7cd6c..28388940bf 100644--- a/storefront/spec/controllers/spree/home_controller_spec.rb+++ b/storefront/spec/controllers/spree/home_controller_spec.rb@@ -1,6 +1,14 @@require 'spec_helper'RSpec.describe Spree::HomeController, type: :controller do+ render_views++ let(:store) { Spree::Store.default }++ before do+ allow(controller).to receive(:current_store).and_return(store)+ end+describe 'GET #index' dobefore { get :index }diff --git a/storefront/spec/controllers/spree/order_status_controller_spec.rb b/storefront/spec/controllers/spree/order_status_controller_spec.rbindex bc890bc782..545344532e 100644--- a/storefront/spec/controllers/spree/order_status_controller_spec.rb+++ b/storefront/spec/controllers/spree/order_status_controller_spec.rb@@ -4,6 +4,8 @@ RSpec.describe Spree::OrderStatusController, type: :controller dolet(:store) { Spree::Store.default }let(:order) { create(:completed_order_with_totals, store: store) }+ render_views+before doallow(controller).to receive(:current_store).and_return(store)enddiff --git a/storefront/spec/controllers/spree/orders_controller_spec.rb b/storefront/spec/controllers/spree/orders_controller_spec.rbindex 9eeb6c598a..fb61cc7dc0 100644--- a/storefront/spec/controllers/spree/orders_controller_spec.rb+++ b/storefront/spec/controllers/spree/orders_controller_spec.rb@@ -6,6 +6,12 @@ describe Spree::OrdersController, type: :controller dolet(:product) { create(:product, stores: [store]) }let(:variant) { create(:variant, product: product) }+ render_views++ before do+ allow(controller).to receive(:current_store).and_return(store)+ end+describe '#edit' dolet(:order) { create(:order_with_totals, store: store, user: user) }@@ -100,20 +106,11 @@ describe Spree::OrdersController, type: :controller dodescribe '#show' dolet(:order) { create(:completed_order_with_totals, store: store) }- before do- allow(controller).to receive(:current_store).and_return(store)- end-it 'renders the show template' doget :show, params: { id: order.number, token: order.token }expect(response).to render_template(:show)end- it 'assigns @order' do- get :show, params: { id: order.number, token: order.token }- expect(assigns(:order)).to eq(order)- end-context 'when order is not found' doit 'raises ActiveRecord::RecordNotFound' doexpect {diff --git a/storefront/spec/controllers/spree/pages_controller_spec.rb b/storefront/spec/controllers/spree/pages_controller_spec.rbindex 73a8ed294e..4ee10c64ac 100644--- a/storefront/spec/controllers/spree/pages_controller_spec.rb+++ b/storefront/spec/controllers/spree/pages_controller_spec.rb@@ -5,6 +5,8 @@ RSpec.describe Spree::PagesController, type: :controller dolet(:store) { Spree::Store.default }let(:page) { create(:custom_page, pageable: store) }+ render_views+before doallow(controller).to receive(:current_store).and_return(store)get :show, params: { id: page.slug }diff --git a/storefront/spec/controllers/spree/search_controller_spec.rb b/storefront/spec/controllers/spree/search_controller_spec.rbindex 6ac1bbb28a..22cf68effc 100644--- a/storefront/spec/controllers/spree/search_controller_spec.rb+++ b/storefront/spec/controllers/spree/search_controller_spec.rb@@ -6,6 +6,8 @@ RSpec.describe Spree::SearchController, type: :controller dolet!(:search_page) { create(:page, type: 'Spree::Pages::SearchResults') }let(:query) { 'test query' }+ render_views+before doallow(controller).to receive(:current_store).and_return(store)allow(controller).to receive(:current_theme).and_return(theme)diff --git a/storefront/spec/controllers/spree/wishlists_controller_spec.rb b/storefront/spec/controllers/spree/wishlists_controller_spec.rbindex c6ea432d32..62bfdf786a 100644--- a/storefront/spec/controllers/spree/wishlists_controller_spec.rb+++ b/storefront/spec/controllers/spree/wishlists_controller_spec.rb@@ -7,6 +7,8 @@ describe Spree::WishlistsController, type: :controller dolet(:variant) { create(:variant) }let!(:wished_item) { create(:wished_item, variant: variant, wishlist: wishlist) }+ render_views+before doallow(controller).to receive(:current_store).and_return(store)allow(controller).to receive(:spree_login_path).and_return('/login')