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.

Fixed flaky tests

Damian Legawiecdd3843b6e250
diff --git a/core/lib/spree/testing_support/factories/line_item_factory.rb b/core/lib/spree/testing_support/factories/line_item_factory.rb
index 629c74117e..1cd12b7b6e 100644
--- a/core/lib/spree/testing_support/factories/line_item_factory.rb
+++ b/core/lib/spree/testing_support/factories/line_item_factory.rb
@@ -4,7 +4,13 @@ FactoryBot.define do
quantity { 1 }
price { BigDecimal('10.00') }
currency { order.currency }
- product { create(:product, stores: [order.store]) }
+ product do
+ if order&.store&.present?
+ create(:product, stores: [order.store])
+ else
+ create(:product)
+ end
+ end
variant { product.master }
end
end
diff --git a/core/spec/models/spree/customer_return_spec.rb b/core/spec/models/spree/customer_return_spec.rb
index 44a6a37750..074a153969 100644
--- a/core/spec/models/spree/customer_return_spec.rb
+++ b/core/spec/models/spree/customer_return_spec.rb
@@ -11,7 +11,7 @@ describe Spree::CustomerReturn, type: :model do
let(:customer_return) { build(:customer_return) }
- let(:inventory_unit) { build(:inventory_unit) }
+ let(:inventory_unit) { create(:inventory_unit) }
let(:return_item) { build(:return_item, inventory_unit: inventory_unit) }
before do
@@ -45,10 +45,10 @@ describe Spree::CustomerReturn, type: :model do
let(:customer_return) { build(:customer_return) }
- let(:first_inventory_unit) { build(:inventory_unit) }
+ let(:first_inventory_unit) { create(:inventory_unit) }
let(:first_return_item) { build(:return_item, inventory_unit: first_inventory_unit) }
- let(:second_inventory_unit) { build(:inventory_unit, order: second_order) }
+ let(:second_inventory_unit) { create(:inventory_unit, order: second_order) }
let(:second_return_item) { build(:return_item, inventory_unit: second_inventory_unit) }
before do
diff --git a/core/spec/models/spree/stock/content_item_spec.rb b/core/spec/models/spree/stock/content_item_spec.rb
index 482f9ef463..b8553d5860 100644
--- a/core/spec/models/spree/stock/content_item_spec.rb
+++ b/core/spec/models/spree/stock/content_item_spec.rb
@@ -3,9 +3,9 @@ require 'spec_helper'
module Spree
module Stock
describe ContentItem, type: :model do
- subject { ContentItem.new(build(:inventory_unit, variant: variant)) }
+ subject { ContentItem.new(create(:inventory_unit, variant: variant)) }
- let(:variant) { build(:variant, weight: 25.0) }
+ let(:variant) { create(:variant, weight: 25.0) }
context '#volume' do
it 'calculate the total volume of the variant' do
diff --git a/core/spec/models/spree/stock/differentiator_spec.rb b/core/spec/models/spree/stock/differentiator_spec.rb
index 4aebeec900..b20eeb31a2 100644
--- a/core/spec/models/spree/stock/differentiator_spec.rb
+++ b/core/spec/models/spree/stock/differentiator_spec.rb
@@ -5,16 +5,16 @@ module Spree
describe Differentiator, type: :model do
subject { Differentiator.new(order, packages) }
- let(:variant1) { mock_model(Variant) }
- let(:variant2) { mock_model(Variant) }
+ let(:variant1) { create(:variant) }
+ let(:variant2) { create(:variant) }
- let(:line_item1) { build(:line_item, variant: variant1, quantity: 2) }
- let(:line_item2) { build(:line_item, variant: variant2, quantity: 2) }
+ let(:line_item1) { create(:line_item, variant: variant1, quantity: 2) }
+ let(:line_item2) { create(:line_item, variant: variant2, quantity: 2) }
let(:stock_location) { mock_model(StockLocation) }
- let(:inventory_unit1) { build(:inventory_unit, variant: variant1, line_item: line_item1) }
- let(:inventory_unit2) { build(:inventory_unit, variant: variant2, line_item: line_item2) }
+ let(:inventory_unit1) { create(:inventory_unit, variant: variant1, line_item: line_item1) }
+ let(:inventory_unit2) { create(:inventory_unit, variant: variant2, line_item: line_item2) }
let(:order) { mock_model(Order, line_items: [line_item1, line_item2]) }
diff --git a/core/spec/models/spree/stock/package_spec.rb b/core/spec/models/spree/stock/package_spec.rb
index 553849c099..60c1ccf9f4 100644
--- a/core/spec/models/spree/stock/package_spec.rb
+++ b/core/spec/models/spree/stock/package_spec.rb
@@ -5,12 +5,12 @@ module Spree
describe Package, type: :model do
subject { Package.new(stock_location) }
- let(:variant) { build(:variant, weight: 25.0) }
+ let(:variant) { create(:variant, weight: 25.0) }
let(:stock_location) { build(:stock_location) }
- let(:order) { build(:order) }
+ let(:order) { create(:order) }
def build_inventory_unit
- build(:inventory_unit, variant: variant)
+ build(:inventory_unit, variant: variant, order: order)
end
it 'calculates the weight of all the contents' do