Skip to content

armgit / spree

Public Imported from GitHub
0

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.

improve option type/option value specs

Damian Legawiec9dc05c97b45c
diff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
index e2325379f5..1dd5c1f7e7 100644
--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
@@ -301,7 +301,7 @@ describe 'API V2 Storefront Products Spec', type: :request do
let!(:green_color) { create(:option_value, option_type: color, name: 'green') }
let!(:white_color) { create(:option_value, option_type: color, name: 'white') }
- let!(:size) { create(:option_type, :size) }
+ let!(:size) { Spree::OptionType.find_by(name: 'size') || create(:option_type, :size) }
let!(:s_size) { create(:option_value, option_type: size, name: 's') }
let!(:m_size) { create(:option_value, option_type: size, name: 'm') }
diff --git a/api/spec/requests/spree/api/v2/storefront/variants_spec.rb b/api/spec/requests/spree/api/v2/storefront/variants_spec.rb
index 6d6cc7e279..d8b57c43c3 100644
--- a/api/spec/requests/spree/api/v2/storefront/variants_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/variants_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'API V2 Storefront Variants Spec', type: :request do
let!(:green_color) { create(:option_value, option_type: color, name: 'green', presentation: 'Green') }
let!(:white_color) { create(:option_value, option_type: color, name: 'white', presentation: 'White') }
- let!(:size) { create(:option_type, :size) }
+ let!(:size) { Spree::OptionType.find_by(name: 'size') || create(:option_type, :size) }
let!(:s_size) { create(:option_value, option_type: size, name: 's', presentation: 'S') }
let!(:m_size) { create(:option_value, option_type: size, name: 'm', presentation: 'M') }
diff --git a/core/spec/finders/spree/option_values/find_available_spec.rb b/core/spec/finders/spree/option_values/find_available_spec.rb
index 418a44c7f8..666186f6ca 100644
--- a/core/spec/finders/spree/option_values/find_available_spec.rb
+++ b/core/spec/finders/spree/option_values/find_available_spec.rb
@@ -4,7 +4,7 @@ module Spree
RSpec.describe OptionValues::FindAvailable do
let(:finder) { described_class.new }
- let!(:size) { create(:option_type, :size) }
+ let!(:size) { Spree::OptionType.find_by(name: 'size') || create(:option_type, :size) }
let!(:s_size) { create(:option_value, option_type: size, name: 's') }
let!(:m_size) { create(:option_value, option_type: size, name: 'm') }
let!(:xl_size) { create(:option_value, option_type: size, name: 'xl') }
diff --git a/core/spec/presenters/spree/filters/options_presenter_spec.rb b/core/spec/presenters/spree/filters/options_presenter_spec.rb
index c94f84b0da..08d8bc8418 100644
--- a/core/spec/presenters/spree/filters/options_presenter_spec.rb
+++ b/core/spec/presenters/spree/filters/options_presenter_spec.rb
@@ -4,14 +4,14 @@ module Spree
RSpec.describe Filters::OptionsPresenter do
let(:options) { described_class.new(option_values_scope: OptionValue.where(id: option_values)) }
- let(:size) { create(:option_type, :size) }
- let(:s_size) { create(:option_value, option_type: size, name: 's') }
- let(:m_size) { create(:option_value, option_type: size, name: 'm') }
+ let(:size) { Spree::OptionType.find_by(name: 'size') || create(:option_type, :size) }
+ let(:s_size) { size.option_values.find_by(name: 's') || create(:option_value, option_type: size, name: 's') }
+ let(:m_size) { size.option_values.find_by(name: 'm') || create(:option_value, option_type: size, name: 'm') }
- let(:color) { create(:option_type, :color) }
- let(:red_color) { create(:option_value, option_type: color, name: 'red') }
- let(:green_color) { create(:option_value, option_type: color, name: 'green') }
- let(:blue_color) { create(:option_value, option_type: color, name: 'blue') }
+ let(:color) { Spree::OptionType.find_by(name: 'color') || create(:option_type, :color) }
+ let(:red_color) { color.option_values.find_by(name: 'red') || create(:option_value, option_type: color, name: 'red') }
+ let(:green_color) { color.option_values.find_by(name: 'green') || create(:option_value, option_type: color, name: 'green') }
+ let(:blue_color) { color.option_values.find_by(name: 'blue') || create(:option_value, option_type: color, name: 'blue') }
let(:option_values) do
[