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 mysql flaky test (#12910)

Damian Legawiec995cc7150e60
diff --git a/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb b/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb
index 692ed2c83b..20efca9b2e 100644
--- a/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb
@@ -1,12 +1,16 @@
require 'spec_helper'
RSpec.describe Spree::Api::V2::Storefront::WishlistsController, type: :request do
- let(:store) { @default_store }
+ let(:store) { create(:store) }
let(:other_store) { create(:store) }
- let(:other_user) { create(:user) }
let(:wishlist) { create(:wishlist, store: store) }
let(:user) { wishlist.user }
+ let(:other_user) { create(:user) }
+
+ before do
+ allow_any_instance_of(Spree::Api::V2::Storefront::WishlistsController).to receive(:current_store).and_return(store)
+ end
include_context 'API v2 tokens'
@@ -56,8 +60,6 @@ RSpec.describe Spree::Api::V2::Storefront::WishlistsController, type: :request d
describe '#index' do
let!(:wishlists) { create_list(:wishlist, 30, user: user, store: store) }
- let!(:wishlist_for_other_user) { create_list(:wishlist, 5, user: other_user, store: store) }
- let!(:wishlists_other_store) { create_list(:wishlist, 5, user: user, store: other_store) }
it 'must return a list of wishlists paged' do
get '/api/v2/storefront/wishlists', headers: headers_bearer
diff --git a/storefront/spec/features/product_list_spec.rb b/storefront/spec/features/product_list_spec.rb
index f3dc9fe77d..749945385e 100644
--- a/storefront/spec/features/product_list_spec.rb
+++ b/storefront/spec/features/product_list_spec.rb
@@ -1,11 +1,11 @@
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!(:product1) { create(:product, name: 'Running Jacket', price: 20.00, available_on: Time.current - 4.days) }
+ let!(:product2) { create(:product, name: 'Waterproof Shoes', price: 10.00, available_on: Time.current - 3.days) }
+ let!(:product3) { create(:product, name: 'Warming gloves', price: 30.00, available_on: Time.current - 2.days) }
let!(:product4) do
- create(:product, name: 'Product out of stock') do |product|
+ create(:product, name: 'Product out of stock', available_on: Time.current - 1.day) do |product|
product.master.stock_items.update_all(backorderable: false)
product.touch
end
@@ -15,7 +15,7 @@ RSpec.describe 'Product list', type: :feature, js: true, job: true do
product.master.prices.delete_all
product
end
- let!(:product6) { create(:product, name: 'Product for free', price: 0.00) }
+ let!(:product6) { create(:product, name: 'Product for free', price: 0.00, available_on: Date.today) }
let!(:size) { Spree::OptionType.find_by(name: 'size') || create(:option_type, :size) }
let!(:small) { create(:option_value, option_type: size, name: 'small', presentation: 'Small') }