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
* refactor after code review * adjust specs
Łukasz Adamczykae5673c19da2
diff --git a/backend/app/controllers/spree/admin/products_controller.rb b/backend/app/controllers/spree/admin/products_controller.rbindex ac69037808..415b61233c 100644--- a/backend/app/controllers/spree/admin/products_controller.rb+++ b/backend/app/controllers/spree/admin/products_controller.rb@@ -4,7 +4,6 @@ module Spreehelper 'spree/products'before_action :load_data, except: :index- before_action :load_stores, only: [:edit, :update]create.before :create_beforeupdate.before :update_before@@ -107,10 +106,6 @@ module Spree@shipping_categories = ShippingCategory.order(:name)end- def load_stores- @stores = Spree::Store.pluck(:name, :id)- end-def collectionreturn @collection if @collection.present?diff --git a/backend/app/views/spree/admin/products/_form.html.erb b/backend/app/views/spree/admin/products/_form.html.erbindex d868ae31cd..963f43e26b 100644--- a/backend/app/views/spree/admin/products/_form.html.erb+++ b/backend/app/views/spree/admin/products/_form.html.erb@@ -253,7 +253,7 @@<%= f.field_container :stores, class: ['form-group'] do %><%= f.label :store_ids, Spree.t(:stores) %><% if can? :modify, Spree::Store %>- <%= f.select :store_ids, @stores, { include_blank: true }, { class: 'select2-clear', multiple: true, "data-placeholder" => Spree.t(:select_stores) } %>+ <%= f.select :store_ids, @stores.pluck(:name, :id), { include_blank: true }, { class: 'select2-clear', multiple: true, "data-placeholder" => Spree.t(:select_stores) } %><% elsif @product.stores.any? %><ul class="text_list"><% @product.stores.each do |store| %>diff --git a/backend/spec/spec_helper.rb b/backend/spec/spec_helper.rbindex 2869c822f5..0a3d4ced85 100644--- a/backend/spec/spec_helper.rb+++ b/backend/spec/spec_helper.rb@@ -31,7 +31,6 @@ require 'rspec/rails'# in ./support/ and its subdirectories.Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }-require 'capybara-select-2'require 'database_cleaner'require 'ffaker'@@ -52,8 +51,6 @@ require 'spree/testing_support/flatpickr_capybara'require 'spree/core/controller_helpers/strong_parameters'require 'webdrivers'-Capybara.javascript_driver = :selenium_chrome-RSpec.configure do |config|config.color = trueconfig.default_formatter = 'doc'diff --git a/core/app/models/spree/store_product.rb b/core/app/models/spree/store_product.rbindex 17f073eb29..2fb0539a9e 100644--- a/core/app/models/spree/store_product.rb+++ b/core/app/models/spree/store_product.rb@@ -2,7 +2,7 @@ module Spreeclass StoreProduct < Spree::Baseself.table_name = 'spree_products_stores'- belongs_to :store, class_name: 'Spree::Store'+ belongs_to :store, class_name: 'Spree::Store', touch: truebelongs_to :product, class_name: 'Spree::Product', touch: truevalidates :store, :product, presence: truediff --git a/core/lib/spree/testing_support/factories/product_factory.rb b/core/lib/spree/testing_support/factories/product_factory.rbindex ffafe2a9f8..6860ea8238 100644--- a/core/lib/spree/testing_support/factories/product_factory.rb+++ b/core/lib/spree/testing_support/factories/product_factory.rb@@ -9,9 +9,22 @@ FactoryBot.define dodeleted_at { nil }shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }+ transient do+ with_store { true }+ end+# ensure stock item will be created for this products masterbefore(:create) { create(:stock_location) unless Spree::StockLocation.any? }+ before(:create) do |product, evaluator|+ if evaluator.with_store && product.stores.empty?+ default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil+ store = default_store || create(:store)++ product.stores << store+ end+ end+factory :custom_product doname { 'Custom Product' }price { 17.99 }diff --git a/core/spec/models/spree/store_product_spec.rb b/core/spec/models/spree/store_product_spec.rbindex c174d8475a..d170f15981 100644--- a/core/spec/models/spree/store_product_spec.rb+++ b/core/spec/models/spree/store_product_spec.rb@@ -1,33 +1,40 @@require 'spec_helper'describe Spree::StoreProduct, type: :model do- let!(:store) { create(:store) }- let!(:store_2) { create(:store) }- let!(:product) { create(:product) }+ let!(:store) { create(:store) }+ let!(:product) { create(:product, with_store: false) }context 'assigning store' do+ subject(:assign_store) { product.stores << store }+it 'touches product' do- expect { product.stores << store }.to change { product.reload.updated_at }+ expect { assign_store }.to change(product, :updated_at)+ end++ it 'touches store' do+ expect { assign_store }.to change(store, :updated_at)endit 'increases Store Product count' do- expect { product.stores << store }.to change(described_class, :count).from(0).to(1)+ expect { assign_store }.to change(described_class, :count).from(0).to(1)endendcontext 'unassignes store' do+ subject(:unassign_store) { product.stores.destroy(store) }+before { product.stores << store }it 'touches product' do- expect { product.stores.destroy(store) }.to change { product.reload.updated_at }+ expect { unassign_store }.to change(product, :updated_at)endit 'decreases Store Product count' do- expect { product.stores.destroy(store) }.to change(described_class, :count).from(1).to(0)+ expect { unassign_store }.to change(described_class, :count).from(1).to(0)endit 'does not remove store' do- expect { product.stores.destroy(store) }.not_to change { Spree::Store.count }+ expect { unassign_store }.not_to change { Spree::Store.count }endendenddiff --git a/frontend/app/controllers/spree/products_controller.rb b/frontend/app/controllers/spree/products_controller.rbindex 500e6fbc14..7bdd8f60db 100644--- a/frontend/app/controllers/spree/products_controller.rb+++ b/frontend/app/controllers/spree/products_controller.rb@@ -62,7 +62,7 @@ module Spreeenddef can_show_product?- raise ActiveRecord::RecordNotFound if @product.stores.empty? || @product.stores.exclude?(current_store)+ raise ActiveRecord::RecordNotFound if @product.stores.exclude?(current_store)enddef load_variantsdiff --git a/frontend/spec/features/address_spec.rb b/frontend/spec/features/address_spec.rbindex 52e18107f6..e7ad9491ac 100644--- a/frontend/spec/features/address_spec.rb+++ b/frontend/spec/features/address_spec.rb@@ -3,7 +3,8 @@ require 'spec_helper'describe 'Address', type: :feature, inaccessible: true dostub_authorization!- let!(:mug) { create(:product, name: 'RoR Mug') }+ let!(:mug) { create(:product, name: 'RoR Mug', stores: [store]) }+ let(:store) { create(:store, default: true) }before docreate(:order_with_totals, state: 'cart')@@ -17,7 +18,6 @@ describe 'Address', type: :feature, inaccessible: true doendcontext 'store checkout_zone', js: true do- let!(:store) { create(:store, default: true) }let!(:asia_zone) dohk = create(:country, name: 'Hong Kong', iso_name: 'HK')create(:zone, name: 'Asia', kind: 'country', default_tax: true).tap do |zone|diff --git a/frontend/spec/features/cart_spec.rb b/frontend/spec/features/cart_spec.rbindex b024681911..0db1588074 100644--- a/frontend/spec/features/cart_spec.rb+++ b/frontend/spec/features/cart_spec.rb@@ -120,10 +120,10 @@ describe 'Cart', type: :feature, inaccessible: true, js: true doendcontext 'switching currency' do- let!(:product) { create(:product) }+ let!(:product) { create(:product, stores: [store]) }+ let(:store) { create(:store, default: true, supported_currencies: 'USD,EUR,GBP') }before do- create(:store, default: true, supported_currencies: 'USD,EUR,GBP')create(:price, variant: product.master, currency: 'EUR', amount: 16.00)create(:price, variant: product.master, currency: 'GBP', amount: 23.00)add_to_cart(product)